@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5bdba89

package/dist/m365/spfx/commands/project/project-doctor/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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const DependencyRule_1 = require("./DependencyRule");
 class FN002016_DEVDEP_types_react_dom extends DependencyRule_1.DependencyRule {
     constructor(supportedRange) {
@@ -11,7 +11,7 @@ class FN002016_DEVDEP_types_react_dom extends DependencyRule_1.DependencyRule {
         return 'FN002016';
     }
     customCondition(project) {
-        return utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN002016_DEVDEP_types_react_dom = FN002016_DEVDEP_types_react_dom;

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

@@ -19,7 +19,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const packageManager_1 = require("../../../../utils/packageManager");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
 const generic_rules_1 = require("./project-doctor/generic-rules");
@@ -62,12 +62,15 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0-beta.1'
+            '1.16.0-rc.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initValidators).call(this);
     }
+    get allowedOutputs() {
+        return ['json', 'text', 'md', 'tour'];
+    }
     get name() {
         return commands_1.default.PROJECT_DOCTOR;
     }
@@ -148,19 +151,19 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
                 // 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;
                 }
             });
@@ -294,7 +297,7 @@ ${f.resolution}
         const packagesDepUn = [];
         const packagesDevUn = [];
         findings.forEach(f => {
-            utils_1.packageManager.mapPackageManagerCommand({
+            packageManager_1.packageManager.mapPackageManagerCommand({
                 command: f.resolution,
                 packagesDevExact,
                 packagesDepExact,
@@ -303,7 +306,7 @@ ${f.resolution}
                 packageMgr: this.packageManager
             });
         });
-        const packageManagerCommands = utils_1.packageManager.reducePackageManagerCommand({
+        const packageManagerCommands = packageManager_1.packageManager.reducePackageManagerCommand({
             packagesDepExact,
             packagesDevExact,
             packagesDepUn,
@@ -333,7 +336,7 @@ _SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_i
 }, _SpfxProjectDoctorCommand_initOptions = function _SpfxProjectDoctorCommand_initOptions() {
     this.options.forEach(o => {
         if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = ['json', 'text', 'md', 'tour'];
+            o.autocomplete = this.allowedOutputs;
         }
     });
     this.options.unshift({

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

@@ -53,6 +53,9 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
         this.allEditSuggestions = [];
         __classPrivateFieldGet(this, _SpfxProjectExternalizeCommand_instances, "m", _SpfxProjectExternalizeCommand_initOptions).call(this);
     }
+    get allowedOutputs() {
+        return ['json', 'text', 'md'];
+    }
     get name() {
         return commands_1.default.PROJECT_EXTERNALIZE;
     }
@@ -185,7 +188,7 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
 _SpfxProjectExternalizeCommand_instances = new WeakSet(), _SpfxProjectExternalizeCommand_initOptions = function _SpfxProjectExternalizeCommand_initOptions() {
     this.options.forEach(o => {
         if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = ['json', 'text', 'md'];
+            o.autocomplete = this.allowedOutputs;
         }
     });
 };

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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isKnockoutProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isKnockoutProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN002016_DEVDEP_types_react_dom = FN002016_DEVDEP_types_react_dom;

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

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

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

@@ -33,10 +33,11 @@ class FN010001_YORC_version extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].version !== this.version) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.version) !== this.version) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.version');
             this.addFindingWithPosition(findings, node);
         }

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

@@ -33,10 +33,11 @@ class FN010002_YORC_isCreatingSolution extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].isCreatingSolution !== this.value) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.isCreatingSolution) !== this.value) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.isCreatingSolution');
             this.addFindingWithPosition(findings, node);
         }

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

@@ -33,10 +33,11 @@ class FN010003_YORC_packageManager extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].packageManager !== this.packageManager) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.packageManager) !== this.packageManager) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.packageManager');
             this.addFindingWithPosition(findings, node);
         }

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

@@ -28,6 +28,7 @@ class FN010004_YORC_componentType extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
@@ -48,7 +49,7 @@ class FN010004_YORC_componentType extends JsonRule_1.JsonRule {
         if (!componentType) {
             componentType = 'webpart';
         }
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].componentType !== componentType) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.componentType) !== componentType) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.componentType');
             this.addFindingWithOccurrences([{
                     file: this.file,

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

@@ -33,10 +33,11 @@ class FN010005_YORC_environment extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].environment !== this.environment) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.environment) !== this.environment) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.environment');
             this.addFindingWithPosition(findings, node);
         }

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

@@ -34,17 +34,18 @@ class FN010006_YORC_framework extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a, _b;
         if (!project.yoRcJson) {
             return;
         }
         if (this.add) {
-            if (project.yoRcJson["@microsoft/generator-sharepoint"].framework !== this.framework) {
+            if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.framework) !== this.framework) {
                 const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.framework');
                 this.addFindingWithPosition(findings, node);
             }
         }
         else {
-            if (project.yoRcJson["@microsoft/generator-sharepoint"].framework) {
+            if ((_b = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _b === void 0 ? void 0 : _b.framework) {
                 const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.framework');
                 this.addFindingWithPosition(findings, node);
             }

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

@@ -33,10 +33,11 @@ class FN010007_YORC_isDomainIsolated extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].isDomainIsolated !== this.value) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.isDomainIsolated) !== this.value) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.isDomainIsolated');
             this.addFindingWithPosition(findings, node);
         }

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

@@ -33,11 +33,12 @@ class FN010008_YORC_nodeVersion extends JsonRule_1.JsonRule {
         return './.yo-rc.json';
     }
     visit(project, findings) {
+        var _a;
         if (!project.yoRcJson) {
             return;
         }
         const nodeVersion = process.version.substring(1);
-        if (project.yoRcJson["@microsoft/generator-sharepoint"].nodeVersion !== nodeVersion) {
+        if (((_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.nodeVersion) !== nodeVersion) {
             const node = this.getAstNodeFromFile(project.yoRcJson, '@microsoft/generator-sharepoint.nodeVersion');
             this.addFindingWithPosition(findings, node);
         }

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

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN010009_YORC_sdkVersions_microsoft_graph_client = void 0;
+const JsonRule_1 = require("../../JsonRule");
+class FN010009_YORC_sdkVersions_microsoft_graph_client extends JsonRule_1.JsonRule {
+    constructor(version) {
+        super();
+        this.version = version;
+    }
+    get id() {
+        return 'FN010009';
+    }
+    get title() {
+        return '.yo-rc.json @microsoft/microsoft-graph-client SDK version';
+    }
+    get description() {
+        return `Update @microsoft/microsoft-graph-client SDK version in .yo-rc.json`;
+    }
+    get resolution() {
+        return `{
+  "@microsoft/generator-sharepoint": {
+    "sdkVersions": {
+      "@microsoft/microsoft-graph-client": "${this.version}"
+    }
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Recommended';
+    }
+    get file() {
+        return './.yo-rc.json';
+    }
+    visit(project, findings) {
+        var _a, _b, _c;
+        if (!project.yoRcJson) {
+            return;
+        }
+        if (((_b = (_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.sdkVersions) === null || _b === void 0 ? void 0 : _b['@microsoft/microsoft-graph-client']) !== this.version) {
+            let nodePath = '@microsoft/generator-sharepoint';
+            if ((_c = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _c === void 0 ? void 0 : _c.sdkVersions) {
+                nodePath += '.sdkVersions';
+                if (project.yoRcJson["@microsoft/generator-sharepoint"].sdkVersions['@microsoft/microsoft-graph-client']) {
+                    nodePath += '.@microsoft/microsoft-graph-client';
+                }
+            }
+            const node = this.getAstNodeFromFile(project.yoRcJson, nodePath);
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN010009_YORC_sdkVersions_microsoft_graph_client = FN010009_YORC_sdkVersions_microsoft_graph_client;
+//# sourceMappingURL=FN010009_YORC_sdkVersions_microsoft_graph_client.js.map

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

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN010010_YORC_sdkVersions_teams_js = void 0;
+const JsonRule_1 = require("../../JsonRule");
+class FN010010_YORC_sdkVersions_teams_js extends JsonRule_1.JsonRule {
+    constructor(version) {
+        super();
+        this.version = version;
+    }
+    get id() {
+        return 'FN010010';
+    }
+    get title() {
+        return '.yo-rc.json @microsoft/teams-js SDK version';
+    }
+    get description() {
+        return `Update @microsoft/teams-js SDK version in .yo-rc.json`;
+    }
+    get resolution() {
+        return `{
+  "@microsoft/generator-sharepoint": {
+    "sdkVersions": {
+      "@microsoft/teams-js": "${this.version}"
+    }
+  }
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Recommended';
+    }
+    get file() {
+        return './.yo-rc.json';
+    }
+    visit(project, findings) {
+        var _a, _b, _c;
+        if (!project.yoRcJson) {
+            return;
+        }
+        if (((_b = (_a = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _a === void 0 ? void 0 : _a.sdkVersions) === null || _b === void 0 ? void 0 : _b['@microsoft/teams-js']) !== this.version) {
+            let nodePath = '@microsoft/generator-sharepoint';
+            if ((_c = project.yoRcJson["@microsoft/generator-sharepoint"]) === null || _c === void 0 ? void 0 : _c.sdkVersions) {
+                nodePath += '.sdkVersions';
+                if (project.yoRcJson["@microsoft/generator-sharepoint"].sdkVersions['@microsoft/teams-js']) {
+                    nodePath += '.@microsoft/teams-js';
+                }
+            }
+            const node = this.getAstNodeFromFile(project.yoRcJson, nodePath);
+            this.addFindingWithPosition(findings, node);
+        }
+    }
+}
+exports.FN010010_YORC_sdkVersions_teams_js = FN010010_YORC_sdkVersions_teams_js;
+//# sourceMappingURL=FN010010_YORC_sdkVersions_teams_js.js.map

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN015008_FILE_eslintrc_js = void 0;
-const utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 const FileAddRemoveRule_1 = require("./FileAddRemoveRule");
 class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
     constructor(add, contents) {
@@ -11,7 +11,7 @@ class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
         return 'FN015008';
     }
     visit(project, notifications) {
-        if (utils_1.spfx.isReactProject(project)) {
+        if (spfx_1.spfx.isReactProject(project)) {
             this.contents = this.contents.replace('@microsoft/eslint-config-spfx/lib/profiles/default', '@microsoft/eslint-config-spfx/lib/profiles/react');
         }
         super.visit(project, notifications);

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 utils_1 = require("../../../../../../utils");
+const spfx_1 = require("../../../../../../utils/spfx");
 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 utils_1.spfx.isReactProject(project);
+        return spfx_1.spfx.isReactProject(project);
     }
 }
 exports.FN020001_RES_types_react = FN020001_RES_types_react;