@pnp/cli-microsoft365 5.9.0-beta.60e454b → 5.9.0-beta.6d50b23

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/{upgrade-1.16.0-beta.1.js → upgrade-1.16.0-beta.2.js}

@@ -4,6 +4,8 @@ const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_m
 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 FN001008_DEP_react_1 = require("./rules/FN001008_DEP_react");
+const FN001009_DEP_react_dom_1 = require("./rules/FN001009_DEP_react_dom");
 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");
@@ -23,39 +25,53 @@ const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_m
 const FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
 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 FN002015_DEVDEP_types_react_1 = require("./rules/FN002015_DEVDEP_types_react");
+const FN002016_DEVDEP_types_react_dom_1 = require("./rules/FN002016_DEVDEP_types_react_dom");
 const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
 const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023_DEVDEP_microsoft_eslint_config_spfx");
 const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
 const FN010008_YORC_nodeVersion_1 = require("./rules/FN010008_YORC_nodeVersion");
+const FN010009_YORC_sdkVersions_microsoft_graph_client_1 = require("./rules/FN010009_YORC_sdkVersions_microsoft_graph_client");
+const FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkVersions_teams_js");
 const FN021003_PKG_engines_node_1 = require("./rules/FN021003_PKG_engines_node");
+const FN022001_SCSS_remove_fabric_react_1 = require("./rules/FN022001_SCSS_remove_fabric_react");
+const FN022002_SCSS_add_fabric_react_1 = require("./rules/FN022002_SCSS_add_fabric_react");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-beta.1'),
-    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.192.0'),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-beta.1'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-beta.1'),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-beta.2'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-beta.2'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-beta.2'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-beta.2'),
+    new FN001008_DEP_react_1.FN001008_DEP_react('17.0.1'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17.0.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-beta.2'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-beta.2'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-beta.2'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-beta.2'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.199.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-beta.2'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-beta.2'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-beta.2'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-beta.2'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-beta.2'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-beta.2'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-beta.2'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-beta.2'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-beta.2'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-beta.2'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-beta.2'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-beta.2'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-beta.2'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-beta.2'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-beta.2'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-beta.2'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17.0.45'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17.0.17'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-beta.2'),
     new FN010008_YORC_nodeVersion_1.FN010008_YORC_nodeVersion(),
-    new FN021003_PKG_engines_node_1.FN021003_PKG_engines_node('>=16.13.0 <17.0.0')
+    new FN010009_YORC_sdkVersions_microsoft_graph_client_1.FN010009_YORC_sdkVersions_microsoft_graph_client('3.0.2'),
+    new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.4.1'),
+    new FN021003_PKG_engines_node_1.FN021003_PKG_engines_node('>=16.13.0 <17.0.0'),
+    new FN022001_SCSS_remove_fabric_react_1.FN022001_SCSS_remove_fabric_react('~office-ui-fabric-react/dist/sass/References.scss'),
+    new FN022002_SCSS_add_fabric_react_1.FN022002_SCSS_add_fabric_react('~@fluentui/react/dist/sass/References.scss')
 ];
-//# sourceMappingURL=upgrade-1.16.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.16.0-beta.2.js.map

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

@@ -66,7 +66,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0-beta.1'
+            '1.16.0-beta.2'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);

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

@@ -449,6 +449,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
     }
+    get allowedOutputs() {
+        return ['text'];
+    }
     get name() {
         return commands_1.default.DOCTOR;
     }
@@ -758,9 +761,6 @@ _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry =
                 return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(this.versions).join(', ')}`;
             }
         }
-        if (args.options.output && args.options.output !== 'text') {
-            return `The output option only accepts the type 'text'`;
-        }
         return true;
     }));
 };

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

@@ -20,6 +20,7 @@ const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +43,13 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const parentInfo = yield this.getParentInfo(args.options.listTitle, args.options.webUrl, logger);
+                let parentInfo = '';
+                if (!args.options.listId && !args.options.listTitle && !args.options.listUrl) {
+                    parentInfo = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
+                }
+                else {
+                    parentInfo = yield this.getParentInfo(args.options, logger);
+                }
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving request digest...`);
                 }
@@ -69,6 +76,8 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
                 const options = {
                     webUrl: args.options.webUrl,
                     listTitle: args.options.listTitle,
+                    listUrl: args.options.listUrl,
+                    listId: args.options.listId,
                     id: args.options.id,
                     output: 'json',
                     debug: this.debug,
@@ -90,60 +99,79 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    getParentInfo(listTitle, webUrl, logger) {
-        return new Promise((resolve, reject) => {
-            if (!listTitle) {
-                resolve('<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />');
-                return;
+    getParentInfo(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const siteId = yield this.getSiteId(options.webUrl, logger);
+            const webId = yield this.getWebId(options.webUrl, logger);
+            const listId = yield this.getListId(options, logger);
+            return `<Identity Id="5" Name="1a48869e-c092-0000-1f61-81ec89809537|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}" />`;
+        });
+    }
+    getSiteId(webUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving site collection id...`);
             }
-            let siteId = '';
-            let webId = '';
-            (() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site collection id...`);
-                }
-                const requestOptions = {
-                    url: `${webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })()
-                .then((res) => {
-                siteId = res.Id;
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site id...`);
-                }
+            const requestOptions = {
+                url: `${webUrl}/_api/site?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const siteResponse = yield request_1.default.get(requestOptions);
+            return siteResponse.Id;
+        });
+    }
+    getWebId(webUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving web id...`);
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/web?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const webResponse = yield request_1.default.get(requestOptions);
+            return webResponse.Id;
+        });
+    }
+    getListId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list id...`);
+            }
+            let listId = '';
+            if (options.listId) {
+                return options.listId;
+            }
+            else if (options.listTitle) {
                 const requestOptions = {
-                    url: `${webUrl}/_api/web?$select=Id`,
+                    url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                webId = res.Id;
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving list id...`);
-                }
+                const listResponse = yield request_1.default.get(requestOptions);
+                listId = listResponse.Id;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitle)}')?$select=Id`,
+                    url: `${options.webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                resolve(`<Identity Id="5" Name="1a48869e-c092-0000-1f61-81ec89809537|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${res.Id}" />`);
-            }, (error) => {
-                reject(error);
-            });
+                const listResponse = yield request_1.default.get(requestOptions);
+                listId = listResponse.Id;
+            }
+            return listId;
         });
     }
 }
@@ -160,6 +188,10 @@ _SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_i
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -170,7 +202,14 @@ _SpoContentTypeAddCommand_instances = new WeakSet(), _SpoContentTypeAddCommand_i
         option: '-g, --group [group]'
     });
 }, _SpoContentTypeAddCommand_initValidators = function _SpoContentTypeAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.listId) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
+                return `${args.options.listId} is not a valid GUID`;
+            }
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
 }, _SpoContentTypeAddCommand_initTypes = function _SpoContentTypeAddCommand_initTypes() {
     this.types.string.push('id', 'i');
 };