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

package/dist/m365/pp/commands/solution/solution-publisher-remove.js

@@ -0,0 +1,130 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PpSolutionPublisherRemoveCommand_instances, _PpSolutionPublisherRemoveCommand_initTelemetry, _PpSolutionPublisherRemoveCommand_initOptions, _PpSolutionPublisherRemoveCommand_initOptionSets, _PpSolutionPublisherRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const Cli_1 = require("../../../../cli/Cli");
+const PpSolutionPublisherGetCommand = require("./solution-publisher-get");
+class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpSolutionPublisherRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpSolutionPublisherRemoveCommand_instances, "m", _PpSolutionPublisherRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.SOLUTION_PUBLISHER_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific publisher in the specified Power Platform environment.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removes a publisher '${args.options.id || args.options.name}'...`);
+            }
+            if (args.options.confirm) {
+                yield this.deletePublisher(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove publisher '${args.options.id || args.options.name}'?`
+                });
+                if (result.continue) {
+                    yield this.deletePublisher(args);
+                }
+            }
+        });
+    }
+    getPublisherId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const options = {
+                environment: args.options.environment,
+                name: args.options.name,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(PpSolutionPublisherGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const getPublisherOutput = JSON.parse(output.stdout);
+            return getPublisherOutput.publisherid;
+        });
+    }
+    deletePublisher(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const publisherId = yield this.getPublisherId(args);
+                const requestOptions = {
+                    url: `${dynamicsApiUrl}/api/data/v9.1/publishers(${publisherId})`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublisherRemoveCommand_initTelemetry = function _PpSolutionPublisherRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PpSolutionPublisherRemoveCommand_initOptions = function _PpSolutionPublisherRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-a, --asAdmin'
+    }, {
+        option: '--confirm'
+    });
+}, _PpSolutionPublisherRemoveCommand_initOptionSets = function _PpSolutionPublisherRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+}, _PpSolutionPublisherRemoveCommand_initValidators = function _PpSolutionPublisherRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PpSolutionPublisherRemoveCommand();
+//# sourceMappingURL=solution-publisher-remove.js.map

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -0,0 +1,130 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PpSolutionRemoveCommand_instances, _PpSolutionRemoveCommand_initTelemetry, _PpSolutionRemoveCommand_initOptions, _PpSolutionRemoveCommand_initOptionSets, _PpSolutionRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const Cli_1 = require("../../../../cli/Cli");
+const PpSolutionGetCommand = require("./solution-get");
+class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpSolutionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpSolutionRemoveCommand_instances, "m", _PpSolutionRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.SOLUTION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific solution in the specified Power Platform environment.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing solution '${args.options.id || args.options.name}'...`);
+            }
+            if (args.options.confirm) {
+                yield this.deleteSolution(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove solution '${args.options.id || args.options.name}'?`
+                });
+                if (result.continue) {
+                    yield this.deleteSolution(args);
+                }
+            }
+        });
+    }
+    getSolutionId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const options = {
+                environment: args.options.environment,
+                name: args.options.name,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(PpSolutionGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const getSolutionOutput = JSON.parse(output.stdout);
+            return getSolutionOutput.solutionid;
+        });
+    }
+    deleteSolution(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const solutionId = yield this.getSolutionId(args);
+                const requestOptions = {
+                    url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_initTelemetry = function _PpSolutionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PpSolutionRemoveCommand_initOptions = function _PpSolutionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-a, --asAdmin'
+    }, {
+        option: '--confirm'
+    });
+}, _PpSolutionRemoveCommand_initOptionSets = function _PpSolutionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+}, _PpSolutionRemoveCommand_initValidators = function _PpSolutionRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PpSolutionRemoveCommand();
+//# sourceMappingURL=solution-remove.js.map

package/dist/m365/pp/commands/tenant/tenant-settings-list.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpTenantSettingsListCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_SETTINGS_LIST;
+    }
+    get description() {
+        return 'Lists the global Power Platform tenant settings';
+    }
+    defaultProperties() {
+        return ['disableCapacityAllocationByEnvironmentAdmins', 'disableEnvironmentCreationByNonAdminUsers', 'disableNPSCommentsReachout', 'disablePortalsCreationByNonAdminUsers', 'disableSupportTicketsVisibleByAllUsers', 'disableSurveyFeedback', 'disableTrialEnvironmentCreationByNonAdminUsers', 'walkMeOptOut'];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/listtenantsettings?api-version=2020-10-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new PpTenantSettingsListCommand();
+//# sourceMappingURL=tenant-settings-list.js.map

package/dist/m365/pp/commands.js

@@ -2,9 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pp';
 exports.default = {
+    CARD_CLONE: `${prefix} card clone`,
+    CARD_GET: `${prefix} card get`,
+    CARD_LIST: `${prefix} card list`,
+    CARD_REMOVE: `${prefix} card remove`,
+    DATAVERSE_TABLE_LIST: `${prefix} dataverse table list`,
+    DATAVERSE_TABLE_GET: `${prefix} dataverse table get`,
+    ENVIRONMENT_GET: `${prefix} environment get`,
     ENVIRONMENT_LIST: `${prefix} environment list`,
+    GATEWAY_GET: `${prefix} gateway get`,
     GATEWAY_LIST: `${prefix} gateway list`,
     MANAGEMENTAPP_ADD: `${prefix} managementapp add`,
-    MANAGEMENTAPP_LIST: `${prefix} managementapp list`
+    MANAGEMENTAPP_LIST: `${prefix} managementapp list`,
+    SOLUTION_GET: `${prefix} solution get`,
+    SOLUTION_LIST: `${prefix} solution list`,
+    SOLUTION_REMOVE: `${prefix} solution remove`,
+    SOLUTION_PUBLISHER_GET: `${prefix} solution publisher get`,
+    SOLUTION_PUBLISHER_LIST: `${prefix} solution publisher list`,
+    SOLUTION_PUBLISHER_REMOVE: `${prefix} solution publisher remove`,
+    TENANT_SETTINGS_LIST: `${prefix} tenant settings list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/search/commands/externalconnection/externalconnection-list.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const commands_1 = require("../../commands");
 class SearchExternalConnectionListCommand extends GraphCommand_1.default {
     get name() {
@@ -25,7 +25,7 @@ class SearchExternalConnectionListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const connections = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/external/connections`);
+                const connections = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/external/connections`);
                 logger.log(connections);
             }
             catch (err) {

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -78,7 +78,7 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
                 yield removeExternalConnection();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

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

@@ -20,7 +20,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const uuid_1 = require("uuid");
-const utils_1 = require("../../../../utils");
+const fsUtil_1 = require("../../../../utils/fsUtil");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
@@ -83,8 +83,8 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
                     logger.log('Copying files...');
                 }
                 const src = path.join(__dirname, 'package-generate', 'assets');
-                utils_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
-                const files = utils_1.fsUtil.readdirR(tmpDir);
+                fsUtil_1.fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
+                const files = fsUtil_1.fsUtil.readdirR(tmpDir);
                 if (this.verbose) {
                     logger.log('Processing files...');
                 }
@@ -122,7 +122,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
                 if (!this.archive) {
                     this.archive = new AdmZip();
                 }
-                const filesToZip = utils_1.fsUtil.readdirR(tmpDir);
+                const filesToZip = fsUtil_1.fsUtil.readdirR(tmpDir);
                 filesToZip.forEach(f => {
                     if (this.debug) {
                         logger.log(`Adding ${f} to archive...`);

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

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

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.16.0-beta.1.js → doctor-1.16.0-rc.0.js}

@@ -10,14 +10,14 @@ const FN002015_DEVDEP_types_react_1 = require("./rules/FN002015_DEVDEP_types_rea
 const FN002016_DEVDEP_types_react_dom_1 = require("./rules/FN002016_DEVDEP_types_react_dom");
 const FN002019_DEVDEP_microsoft_rush_stack_compiler_1 = require("./rules/FN002019_DEVDEP_microsoft_rush_stack_compiler");
 module.exports = [
-    new FN001008_DEP_react_1.FN001008_DEP_react('16'),
-    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('16'),
-    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.192.0'),
+    new FN001008_DEP_react_1.FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('^7.199.1'),
     new FN002004_DEVDEP_gulp_1.FN002004_DEVDEP_gulp('4.0.2'),
     new FN002007_DEVDEP_ajv_1.FN002007_DEVDEP_ajv('^6.12.5'),
     new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('~1.15.2'),
-    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('16'),
-    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('16'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
 ];
-//# sourceMappingURL=doctor-1.16.0-beta.1.js.map
+//# sourceMappingURL=doctor-1.16.0-rc.0.js.map

package/dist/m365/spfx/commands/project/project-doctor/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(supportedRange) {
@@ -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-doctor/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(supportedRange) {
@@ -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-doctor/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(supportedRange) {
@@ -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-doctor/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(supportedRange) {
@@ -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;