@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.efe1dcb

package/dist/m365/spfx/commands/project/base-project-command.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseProjectCommand = void 0;
 const fs = require("fs");
 const path = require("path");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const model_1 = require("./model");
-const project_upgrade_1 = require("./project-upgrade/");
 class BaseProjectCommand extends AnonymousCommand_1.default {
     constructor() {
         super(...arguments);
@@ -37,7 +36,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const configJsonPath = path.join(projectRootPath, 'config/config.json');
         if (fs.existsSync(configJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(configJsonPath, 'utf-8'));
                 project.configJson = JSON.parse(source);
                 project.configJson.source = source;
             }
@@ -46,7 +45,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const copyAssetsJsonPath = path.join(projectRootPath, 'config/copy-assets.json');
         if (fs.existsSync(copyAssetsJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(copyAssetsJsonPath, 'utf-8'));
                 project.copyAssetsJson = JSON.parse(source);
                 project.copyAssetsJson.source = source;
             }
@@ -55,7 +54,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const deployAzureStorageJsonPath = path.join(projectRootPath, 'config/deploy-azure-storage.json');
         if (fs.existsSync(deployAzureStorageJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(deployAzureStorageJsonPath, 'utf-8'));
                 project.deployAzureStorageJson = JSON.parse(source);
                 project.deployAzureStorageJson.source = source;
             }
@@ -64,7 +63,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const packageJsonPath = path.join(projectRootPath, 'package.json');
         if (fs.existsSync(packageJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(packageJsonPath, 'utf-8'));
                 project.packageJson = JSON.parse(source);
                 project.packageJson.source = source;
             }
@@ -73,7 +72,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const packageSolutionJsonPath = path.join(projectRootPath, 'config/package-solution.json');
         if (fs.existsSync(packageSolutionJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(packageSolutionJsonPath, 'utf-8'));
                 project.packageSolutionJson = JSON.parse(source);
                 project.packageSolutionJson.source = source;
             }
@@ -82,7 +81,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const serveJsonPath = path.join(projectRootPath, 'config/serve.json');
         if (fs.existsSync(serveJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(serveJsonPath, 'utf-8'));
                 project.serveJson = JSON.parse(source);
                 project.serveJson.source = source;
             }
@@ -91,7 +90,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsConfigJsonPath = path.join(projectRootPath, 'tsconfig.json');
         if (fs.existsSync(tsConfigJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsConfigJsonPath, 'utf-8'));
                 project.tsConfigJson = JSON.parse(source);
                 project.tsConfigJson.source = source;
             }
@@ -100,7 +99,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsLintJsonPath = path.join(projectRootPath, 'config/tslint.json');
         if (fs.existsSync(tsLintJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonPath, 'utf-8'));
                 project.tsLintJson = JSON.parse(source);
                 project.tsLintJson.source = source;
             }
@@ -109,7 +108,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const tsLintJsonRootPath = path.join(projectRootPath, 'tslint.json');
         if (fs.existsSync(tsLintJsonRootPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(tsLintJsonRootPath, 'utf-8'));
                 project.tsLintJsonRoot = JSON.parse(source);
                 project.tsLintJsonRoot.source = source;
             }
@@ -118,7 +117,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const writeManifestJsonPath = path.join(projectRootPath, 'config/write-manifests.json');
         if (fs.existsSync(writeManifestJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(writeManifestJsonPath, 'utf-8'));
                 project.writeManifestsJson = JSON.parse(source);
                 project.writeManifestsJson.source = source;
             }
@@ -127,7 +126,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const yoRcJsonPath = path.join(projectRootPath, '.yo-rc.json');
         if (fs.existsSync(yoRcJsonPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(yoRcJsonPath, 'utf-8'));
                 project.yoRcJson = JSON.parse(source);
                 project.yoRcJson.source = source;
             }
@@ -143,7 +142,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeSettingsPath = path.join(projectRootPath, '.vscode', 'settings.json');
         if (fs.existsSync(vsCodeSettingsPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeSettingsPath, 'utf-8'));
                 project.vsCode.settingsJson = JSON.parse(source);
                 project.vsCode.settingsJson.source = source;
             }
@@ -152,7 +151,7 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeExtensionsPath = path.join(projectRootPath, '.vscode', 'extensions.json');
         if (fs.existsSync(vsCodeExtensionsPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeExtensionsPath, 'utf-8'));
                 project.vsCode.extensionsJson = JSON.parse(source);
                 project.vsCode.extensionsJson.source = source;
             }
@@ -161,17 +160,17 @@ class BaseProjectCommand extends AnonymousCommand_1.default {
         const vsCodeLaunchPath = path.join(projectRootPath, '.vscode', 'launch.json');
         if (fs.existsSync(vsCodeLaunchPath)) {
             try {
-                const source = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
+                const source = utils_1.formatting.removeSingleLineComments(fs.readFileSync(vsCodeLaunchPath, 'utf-8'));
                 project.vsCode.launchJson = JSON.parse(source);
                 project.vsCode.launchJson.source = source;
             }
             catch (_r) { }
         }
-        const srcFiles = project_upgrade_1.Utils.getAllFiles(path.join(projectRootPath, 'src'));
+        const srcFiles = utils_1.fsUtil.readdirR(path.join(projectRootPath, 'src'));
         const manifestFiles = srcFiles.filter(f => f.endsWith('.manifest.json'));
         const manifests = manifestFiles.map((f) => {
-            const manifestStr = project_upgrade_1.Utils.removeSingleLineComments(fs.readFileSync(f, 'utf-8'));
-            const manifest = Utils_1.default.parseJsonWithBom(manifestStr);
+            const manifestStr = utils_1.formatting.removeSingleLineComments(fs.readFileSync(f, 'utf-8'));
+            const manifest = utils_1.formatting.parseJsonWithBom(manifestStr);
             manifest.path = f;
             manifest.source = manifestStr;
             return manifest;

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

@@ -16,5 +16,4 @@ __exportStar(require("./Finding"), exports);
 __exportStar(require("./FindingToReport"), exports);
 __exportStar(require("./Hash"), exports);
 __exportStar(require("./Occurrence"), exports);
-__exportStar(require("./Utils"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001005_DEP_types_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001005_DEP_types_react extends DependencyRule_1.DependencyRule {
     constructor(packageVersion, add = true) {
@@ -11,7 +11,7 @@ class FN001005_DEP_types_react extends DependencyRule_1.DependencyRule {
         return 'FN001005';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001005_DEP_types_react = FN001005_DEP_types_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001006_DEP_types_react_dom = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001006_DEP_types_react_dom extends DependencyRule_1.DependencyRule {
     constructor(packageVersion, add = true) {
@@ -11,7 +11,7 @@ class FN001006_DEP_types_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN001006';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001006_DEP_types_react_dom = FN001006_DEP_types_react_dom;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001008_DEP_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001008_DEP_react extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN001008_DEP_react extends DependencyRule_1.DependencyRule {
         return 'FN001008';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001008_DEP_react = FN001008_DEP_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001009_DEP_react_dom = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001009_DEP_react_dom extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN001009_DEP_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN001009';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001009_DEP_react_dom = FN001009_DEP_react_dom;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001015_DEP_types_react_addons_shallow_compare = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001015_DEP_types_react_addons_shallow_compare extends DependencyRule_1.DependencyRule {
     constructor(packageVersion, add) {
@@ -11,7 +11,7 @@ class FN001015_DEP_types_react_addons_shallow_compare extends DependencyRule_1.D
         return 'FN001015';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001015_DEP_types_react_addons_shallow_compare = FN001015_DEP_types_react_addons_shallow_compare;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001016_DEP_types_react_addons_update = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001016_DEP_types_react_addons_update extends DependencyRule_1.DependencyRule {
     constructor(packageVersion, add) {
@@ -11,7 +11,7 @@ class FN001016_DEP_types_react_addons_update extends DependencyRule_1.Dependency
         return 'FN001016';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001016_DEP_types_react_addons_update = FN001016_DEP_types_react_addons_update;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001017_DEP_types_react_addons_test_utils = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001017_DEP_types_react_addons_test_utils extends DependencyRule_1.DependencyRule {
     constructor(packageVersion, add) {
@@ -11,7 +11,7 @@ class FN001017_DEP_types_react_addons_test_utils extends DependencyRule_1.Depend
         return 'FN001017';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001017_DEP_types_react_addons_test_utils = FN001017_DEP_types_react_addons_test_utils;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001019_DEP_knockout = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001019_DEP_knockout extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN001019_DEP_knockout extends DependencyRule_1.DependencyRule {
         return 'FN001019';
     }
     customCondition(project) {
-        return __1.Utils.isKnockoutProject(project);
+        return utils_1.spfx.isKnockoutProject(project);
     }
 }
 exports.FN001019_DEP_knockout = FN001019_DEP_knockout;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001020_DEP_types_knockout = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001020_DEP_types_knockout extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN001020_DEP_types_knockout extends DependencyRule_1.DependencyRule {
         return 'FN001020';
     }
     customCondition(project) {
-        return __1.Utils.isKnockoutProject(project);
+        return utils_1.spfx.isKnockoutProject(project);
     }
 }
 exports.FN001020_DEP_types_knockout = FN001020_DEP_types_knockout;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN001022_DEP_office_ui_fabric_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN001022_DEP_office_ui_fabric_react extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN001022_DEP_office_ui_fabric_react extends DependencyRule_1.DependencyRul
         return 'FN001022';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN001022_DEP_office_ui_fabric_react = FN001022_DEP_office_ui_fabric_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN002015_DEVDEP_types_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN002015_DEVDEP_types_react extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN002015_DEVDEP_types_react extends DependencyRule_1.DependencyRule {
         return 'FN002015';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN002015_DEVDEP_types_react = FN002015_DEVDEP_types_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN002016_DEVDEP_types_react_dom = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const DependencyRule_1 = require("./DependencyRule");
 class FN002016_DEVDEP_types_react_dom extends DependencyRule_1.DependencyRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN002016_DEVDEP_types_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN002016';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN002016_DEVDEP_types_react_dom = FN002016_DEVDEP_types_react_dom;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN020001_RES_types_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const ResolutionRule_1 = require("./ResolutionRule");
 class FN020001_RES_types_react extends ResolutionRule_1.ResolutionRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN020001_RES_types_react extends ResolutionRule_1.ResolutionRule {
         return 'FN020001';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN020001_RES_types_react = FN020001_RES_types_react;

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/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;
     }