@pnp/cli-microsoft365 6.0.0-beta.f782445 → 6.0.0-beta.fcd2cc9

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

@@ -1,4 +1,13 @@
 "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");
@@ -6,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");
@@ -47,41 +56,39 @@ class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
         });
     }
-    commandAction(logger, args, cb) {
-        const removeExternalConnection = () => {
-            this
-                .getExternalConnectionId(args)
-                .then((externalConnectionId) => {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/external/connections/${encodeURIComponent(externalConnectionId)}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default
-                    .delete(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeExternalConnection();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeExternalConnection = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const externalConnectionId = yield this.getExternalConnectionId(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/external/connections/${encodeURIComponent(externalConnectionId)}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeExternalConnection();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeExternalConnection();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
+                });
+                if (result.continue) {
+                    yield removeExternalConnection();
+                }
+            }
+        });
     }
 }
 _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {

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 {
@@ -37,119 +37,126 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Generates SharePoint Framework solution package with a no-framework web part rendering the specified HTML snippet';
     }
-    commandAction(logger, args, cb) {
-        const supportedHosts = ['SharePointWebPart'];
-        if (args.options.enableForTeams === 'tab' || args.options.enableForTeams === 'all') {
-            supportedHosts.push('TeamsTab');
-        }
-        if (args.options.enableForTeams === 'personalApp' || args.options.enableForTeams === 'all') {
-            supportedHosts.push('TeamsPersonalApp');
-        }
-        const tokens = {
-            clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
-            developerName: args.options.developerName || 'Contoso',
-            developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
-            developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
-            developerTermsOfUseUrl: args.options.developerTermsOfUseUrl || 'https://contoso.com/terms-of-use',
-            developerMpnId: args.options.developerMpnId || '000000',
-            exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
-            exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
-            html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
-            packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
-            productId: SpfxPackageGenerateCommand.generateNewId(),
-            skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
-            supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
-            webPartId: SpfxPackageGenerateCommand.generateNewId(),
-            webPartFeatureName: `${args.options.webPartTitle} Feature`,
-            webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
-            webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
-            webPartName: args.options.webPartTitle,
-            webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
-            webPartDescription: args.options.webPartDescription,
-            webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
-        };
-        let tmpDir = undefined;
-        let error;
-        try {
-            if (this.verbose) {
-                logger.log(`Creating temp folder...`);
-            }
-            tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cli-spfx'));
-            if (this.debug) {
-                logger.log(`Temp folder created at ${tmpDir}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const supportedHosts = ['SharePointWebPart'];
+            if (args.options.enableForTeams === 'tab' || args.options.enableForTeams === 'all') {
+                supportedHosts.push('TeamsTab');
             }
-            if (this.verbose) {
-                logger.log('Copying files...');
+            if (args.options.enableForTeams === 'personalApp' || args.options.enableForTeams === 'all') {
+                supportedHosts.push('TeamsPersonalApp');
             }
-            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);
-            if (this.verbose) {
-                logger.log('Processing files...');
-            }
-            files.forEach(filePath => {
+            const tokens = {
+                clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
+                developerName: args.options.developerName || 'Contoso',
+                developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
+                developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
+                developerTermsOfUseUrl: args.options.developerTermsOfUseUrl || 'https://contoso.com/terms-of-use',
+                developerMpnId: args.options.developerMpnId || '000000',
+                exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
+                exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
+                html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
+                packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
+                productId: SpfxPackageGenerateCommand.generateNewId(),
+                skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
+                supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
+                webPartId: SpfxPackageGenerateCommand.generateNewId(),
+                webPartFeatureName: `${args.options.webPartTitle} Feature`,
+                webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
+                webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
+                webPartName: args.options.webPartTitle,
+                webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
+                webPartDescription: args.options.webPartDescription,
+                webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
+            };
+            let tmpDir = undefined;
+            let error;
+            try {
+                if (this.verbose) {
+                    logger.log(`Creating temp folder...`);
+                }
+                tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cli-spfx'));
                 if (this.debug) {
-                    logger.log(`Processing ${filePath}...`);
+                    logger.log(`Temp folder created at ${tmpDir}`);
                 }
-                if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
-                    if (this.verbose) {
-                        logger.log('Replacing tokens...');
-                    }
-                    let fileContents = fs.readFileSync(filePath, 'utf-8');
+                if (this.verbose) {
+                    logger.log('Copying files...');
+                }
+                const src = path.join(__dirname, 'package-generate', 'assets');
+                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...');
+                }
+                files.forEach(filePath => {
                     if (this.debug) {
-                        logger.log('Before:');
-                        logger.log(fileContents);
+                        logger.log(`Processing ${filePath}...`);
                     }
-                    fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
-                    if (this.debug) {
-                        logger.log('After:');
-                        logger.log(fileContents);
+                    if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
+                        if (this.verbose) {
+                            logger.log('Replacing tokens...');
+                        }
+                        let fileContents = fs.readFileSync(filePath, 'utf-8');
+                        if (this.debug) {
+                            logger.log('Before:');
+                            logger.log(fileContents);
+                        }
+                        fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
+                        if (this.debug) {
+                            logger.log('After:');
+                            logger.log(fileContents);
+                        }
+                        fs.writeFileSync(filePath, fileContents, { encoding: 'utf-8' });
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.log(`Binary file. Skipping replacing tokens in contents`);
+                        }
                     }
-                    fs.writeFileSync(filePath, fileContents, { encoding: 'utf-8' });
+                });
+                if (this.verbose) {
+                    logger.log('Creating .sppkg file...');
+                }
+                // we need this to be able to inject mock AdmZip for testing
+                /* c8 ignore next 3 */
+                if (!this.archive) {
+                    this.archive = new AdmZip();
                 }
-                else {
-                    if (this.verbose) {
-                        logger.log(`Binary file. Skipping replacing tokens in contents`);
+                const filesToZip = fsUtil_1.fsUtil.readdirR(tmpDir);
+                filesToZip.forEach(f => {
+                    if (this.debug) {
+                        logger.log(`Adding ${f} to archive...`);
                     }
+                    this.archive.addLocalFile(f, path.relative(tmpDir, path.dirname(f)), path.basename(f));
+                });
+                if (this.debug) {
+                    logger.log('Writing archive...');
                 }
-            });
-            if (this.verbose) {
-                logger.log('Creating .sppkg file...');
+                this.archive.writeZip(`${args.options.name}.sppkg`);
             }
-            // we need this to be able to inject mock AdmZip for testing
-            /* c8 ignore next 3 */
-            if (!this.archive) {
-                this.archive = new AdmZip();
+            catch (err) {
+                error = err.message;
             }
-            const filesToZip = utils_1.fsUtil.readdirR(tmpDir);
-            filesToZip.forEach(f => {
-                if (this.debug) {
-                    logger.log(`Adding ${f} to archive...`);
+            finally {
+                try {
+                    if (tmpDir) {
+                        if (this.verbose) {
+                            logger.log(`Deleting temp folder at ${tmpDir}...`);
+                        }
+                        fs.rmdirSync(tmpDir, { recursive: true });
+                    }
+                    if (error) {
+                        throw error;
+                    }
                 }
-                this.archive.addLocalFile(f, path.relative(tmpDir, path.dirname(f)), path.basename(f));
-            });
-            if (this.debug) {
-                logger.log('Writing archive...');
-            }
-            this.archive.writeZip(`${args.options.name}.sppkg`);
-        }
-        catch (err) {
-            error = err.message;
-        }
-        finally {
-            try {
-                if (tmpDir) {
-                    if (this.verbose) {
-                        logger.log(`Deleting temp folder at ${tmpDir}...`);
+                catch (ex) {
+                    if (ex === error) {
+                        throw ex;
                     }
-                    fs.rmdirSync(tmpDir, { recursive: true });
+                    throw `An error has occurred while removing the temp folder at ${tmpDir}. Please remove it manually.`;
                 }
-                cb(error);
             }
-            catch (ex) {
-                cb(`An error has occurred while removing the temp folder at ${tmpDir}. Please remove it manually.`);
-            }
-        }
+        });
     }
     static replaceTokens(s, tokens) {
         return s.replace(/\$([^\$]+)\$/g, (substring, token) => {

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;

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;

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

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