@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

package/dist/m365/pp/commands/gateway/gateway-get.js

@@ -0,0 +1,70 @@
+"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 _PpGatewayGetCommand_instances, _PpGatewayGetCommand_initOptions, _PpGatewayGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const PowerBICommand_1 = require("../../../base/PowerBICommand");
+const commands_1 = require("../../commands");
+class PpGatewayGetCommand extends PowerBICommand_1.default {
+    constructor() {
+        super();
+        _PpGatewayGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpGatewayGetCommand_instances, "m", _PpGatewayGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpGatewayGetCommand_instances, "m", _PpGatewayGetCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.GATEWAY_GET;
+    }
+    get description() {
+        return "Get information about the specified gateway.";
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const gateway = yield this.getGateway(args.options.id);
+                logger.log(gateway);
+            }
+            catch (error) {
+                this.handleRejectedODataJsonPromise(error);
+            }
+        });
+    }
+    getGateway(gatewayId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorg/gateways/${encodeURIComponent(gatewayId)}`,
+            headers: {
+                accept: "application/json;odata.metadata=none"
+            },
+            responseType: "json"
+        };
+        return request_1.default.get(requestOptions);
+    }
+}
+_PpGatewayGetCommand_instances = new WeakSet(), _PpGatewayGetCommand_initOptions = function _PpGatewayGetCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --id <id>"
+    });
+}, _PpGatewayGetCommand_initValidators = function _PpGatewayGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PpGatewayGetCommand();
+//# sourceMappingURL=gateway-get.js.map

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PpManagementAppAddCommand_instances, _PpManagementAppAddCommand_initTelemetry, _PpManagementAppAddCommand_initOptions, _PpManagementAppAddCommand_initValidators, _PpManagementAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
@@ -95,10 +95,10 @@ _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' });
 }, _PpManagementAppAddCommand_initValidators = function _PpManagementAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/pp/commands/managementapp/managementapp-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 class PpManagementAppListCommand extends PowerPlatformCommand_1.default {
@@ -23,7 +23,7 @@ class PpManagementAppListCommand extends PowerPlatformCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications?api-version=2020-06-01`;
             try {
-                const managementApps = yield utils_1.odata.getAllItems(endpoint);
+                const managementApps = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(managementApps);
             }
             catch (err) {

package/dist/m365/pp/commands/solution/Solution.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Solution.js.map

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

@@ -0,0 +1,117 @@
+"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 _PpSolutionGetCommand_instances, _PpSolutionGetCommand_initTelemetry, _PpSolutionGetCommand_initOptions, _PpSolutionGetCommand_initOptionSets, _PpSolutionGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const validation_1 = require("../../../../utils/validation");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpSolutionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.SOLUTION_GET;
+    }
+    get description() {
+        return 'Gets a specific solution in a given environment.';
+    }
+    defaultProperties() {
+        return ['uniquename', 'version', 'publisher'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving a specific solution '${args.options.id || args.options.name}'...`);
+            }
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const res = yield this.getSolution(dynamicsApiUrl, args.options);
+                if (!args.options.output || args.options.output === 'json') {
+                    logger.log(res);
+                }
+                else {
+                    // Converted to text friendly output
+                    logger.log({
+                        uniquename: res.uniquename,
+                        version: res.version,
+                        publisher: res.publisherid.friendlyname
+                    });
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getSolution(dynamicsApiUrl, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            if (options.id) {
+                requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+                const result = yield request_1.default.get(requestOptions);
+                return result;
+            }
+            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${options.name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+            const result = yield request_1.default.get(requestOptions);
+            if (result.value.length === 0) {
+                throw `The specified solution '${options.name}' does not exist.`;
+            }
+            return result.value[0];
+        });
+    }
+}
+_PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelemetry = function _PpSolutionGetCommand_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
+        });
+    });
+}, _PpSolutionGetCommand_initOptions = function _PpSolutionGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-a, --asAdmin'
+    });
+}, _PpSolutionGetCommand_initOptionSets = function _PpSolutionGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+}, _PpSolutionGetCommand_initValidators = function _PpSolutionGetCommand_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 PpSolutionGetCommand();
+//# sourceMappingURL=solution-get.js.map

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

@@ -0,0 +1,87 @@
+"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 _PpSolutionListCommand_instances, _PpSolutionListCommand_initTelemetry, _PpSolutionListCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpSolutionListCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpSolutionListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpSolutionListCommand_instances, "m", _PpSolutionListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpSolutionListCommand_instances, "m", _PpSolutionListCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.SOLUTION_LIST;
+    }
+    get description() {
+        return 'Lists solutions in a given environment.';
+    }
+    defaultProperties() {
+        return ['uniquename', 'version', 'publisher'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of solutions for which the user is an admin...`);
+            }
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const requestOptions = {
+                    url: `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (!args.options.output || args.options.output === 'json') {
+                    logger.log(res.value);
+                }
+                else {
+                    //converted to text friendly output
+                    logger.log(res.value.map(i => {
+                        return {
+                            uniquename: i.uniquename,
+                            version: i.version,
+                            publisher: i.publisherid.friendlyname
+                        };
+                    }));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PpSolutionListCommand_instances = new WeakSet(), _PpSolutionListCommand_initTelemetry = function _PpSolutionListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PpSolutionListCommand_initOptions = function _PpSolutionListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-a, --asAdmin'
+    });
+};
+module.exports = new PpSolutionListCommand();
+//# sourceMappingURL=solution-list.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,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pp';
 exports.default = {
+    CARD_GET: `${prefix} card get`,
+    CARD_LIST: `${prefix} card list`,
+    DATAVERSE_TABLE_LIST: `${prefix} dataverse table list`,
+    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`,
+    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/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;