@pnp/cli-microsoft365 5.0.0-beta.fe151d6 → 5.1.0-beta.c8f5fd7

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

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

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

@@ -16,5 +16,4 @@ __exportStar(require("./Finding"), exports);
 __exportStar(require("./FindingToReport"), exports);
 __exportStar(require("./Hash"), exports);
 __exportStar(require("./Occurrence"), exports);
-__exportStar(require("./Utils"), exports);
 //# sourceMappingURL=index.js.map

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN006005_CFG_PS_metadata = void 0;
+const JsonRule_1 = require("./JsonRule");
+class FN006005_CFG_PS_metadata extends JsonRule_1.JsonRule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN006005';
+    }
+    get title() {
+        return 'package-solution.json metadata';
+    }
+    get description() {
+        return `In package-solution.json add metadata section`;
+    }
+    get resolution() {
+        return '';
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './config/package-solution.json';
+    }
+    visit(project, findings) {
+        var _a;
+        if (!project.packageSolutionJson ||
+            !project.packageSolutionJson.solution) {
+            return;
+        }
+        if (!project.packageSolutionJson.solution.metadata) {
+            const solutionDescription = `${(_a = project.packageJson) === null || _a === void 0 ? void 0 : _a.name} description`;
+            const resolution = {
+                solution: {
+                    metadata: {
+                        shortDescription: {
+                            default: solutionDescription
+                        },
+                        longDescription: {
+                            default: solutionDescription
+                        },
+                        screenshotPaths: [],
+                        videoUrl: '',
+                        categories: []
+                    }
+                }
+            };
+            const node = this.getAstNodeFromFile(project.packageSolutionJson, 'solution');
+            this.addFindingWithOccurrences([{
+                    file: this.file,
+                    resolution: JSON.stringify(resolution, null, 2),
+                    position: this.getPositionFromNode(node)
+                }], findings);
+        }
+    }
+}
+exports.FN006005_CFG_PS_metadata = FN006005_CFG_PS_metadata;
+//# sourceMappingURL=FN006005_CFG_PS_metadata.js.map

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

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN006006_CFG_PS_features = void 0;
+const JsonRule_1 = require("./JsonRule");
+const uuid_1 = require("uuid");
+class FN006006_CFG_PS_features extends JsonRule_1.JsonRule {
+    constructor() {
+        super();
+    }
+    get id() {
+        return 'FN006006';
+    }
+    get title() {
+        return 'package-solution.json features';
+    }
+    get description() {
+        return `In package-solution.json add features section`;
+    }
+    get resolution() {
+        return '';
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Required';
+    }
+    get file() {
+        return './config/package-solution.json';
+    }
+    visit(project, findings) {
+        var _a, _b;
+        if (!project.packageSolutionJson ||
+            !project.packageSolutionJson.solution) {
+            return;
+        }
+        if (!project.packageSolutionJson.solution.features) {
+            const resolution = {
+                solution: {
+                    features: [
+                        {
+                            title: `${(_a = project.packageJson) === null || _a === void 0 ? void 0 : _a.name} Feature`,
+                            description: `The feature that activates elements of the ${(_b = project.packageJson) === null || _b === void 0 ? void 0 : _b.name} solution.`,
+                            id: (0, uuid_1.v4)(),
+                            version: project.packageSolutionJson.solution.version
+                        }
+                    ]
+                }
+            };
+            const node = this.getAstNodeFromFile(project.packageSolutionJson, 'solution');
+            this.addFindingWithOccurrences([{
+                    file: this.file,
+                    resolution: JSON.stringify(resolution, null, 2),
+                    position: this.getPositionFromNode(node)
+                }], findings);
+        }
+    }
+}
+exports.FN006006_CFG_PS_features = FN006006_CFG_PS_features;
+//# sourceMappingURL=FN006006_CFG_PS_features.js.map

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

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN014008_CODE_launch_hostedWorkbench_type = void 0;
+const path = require("path");
+const JsonRule_1 = require("./JsonRule");
+class FN014008_CODE_launch_hostedWorkbench_type extends JsonRule_1.JsonRule {
+    constructor(type) {
+        super();
+        this.type = type;
+    }
+    get id() {
+        return 'FN014008';
+    }
+    get title() {
+        return 'Hosted workbench type in .vscode/launch.json';
+    }
+    get description() {
+        return `In the .vscode/launch.json file, update the type property for the hosted workbench launch configuration`;
+    }
+    get resolution() {
+        return `{
+  "configurations": [
+    {
+      "type": "${this.type}"
+    }
+  ]
+}`;
+    }
+    get resolutionType() {
+        return 'json';
+    }
+    get severity() {
+        return 'Recommended';
+    }
+    get file() {
+        return '.vscode/launch.json';
+    }
+    visit(project, findings) {
+        if (!project.vsCode ||
+            !project.vsCode.launchJson ||
+            !project.vsCode.launchJson.configurations) {
+            return;
+        }
+        const occurrences = [];
+        project.vsCode.launchJson.configurations.forEach((configuration, i) => {
+            if (configuration.name === 'Hosted workbench' &&
+                configuration.type !== this.type) {
+                const node = this.getAstNodeFromFile(project.vsCode.launchJson, `configurations[${i}].url`);
+                occurrences.push({
+                    file: path.relative(project.path, this.file),
+                    resolution: this.resolution,
+                    position: this.getPositionFromNode(node)
+                });
+            }
+        });
+        if (occurrences.length > 0) {
+            this.addFindingWithOccurrences(occurrences, findings);
+        }
+    }
+}
+exports.FN014008_CODE_launch_hostedWorkbench_type = FN014008_CODE_launch_hostedWorkbench_type;
+//# sourceMappingURL=FN014008_CODE_launch_hostedWorkbench_type.js.map

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN020001_RES_types_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const ResolutionRule_1 = require("./ResolutionRule");
 class FN020001_RES_types_react extends ResolutionRule_1.ResolutionRule {
     constructor(packageVersion) {
@@ -11,7 +11,7 @@ class FN020001_RES_types_react extends ResolutionRule_1.ResolutionRule {
         return 'FN020001';
     }
     customCondition(project) {
-        return __1.Utils.isReactProject(project);
+        return utils_1.spfx.isReactProject(project);
     }
 }
 exports.FN020001_RES_types_react = FN020001_RES_types_react;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN022001_SCSS_remove_fabric_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const ScssRule_1 = require("./ScssRule");
 class FN022001_SCSS_remove_fabric_react extends ScssRule_1.ScssRule {
     constructor(importValue) {
@@ -30,7 +30,7 @@ class FN022001_SCSS_remove_fabric_react extends ScssRule_1.ScssRule {
         return '';
     }
     visit(project, findings) {
-        if (__1.Utils.isReactProject(project) === false) {
+        if (utils_1.spfx.isReactProject(project) === false) {
             return;
         }
         if (!project.scssFiles ||

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN022002_SCSS_add_fabric_react = void 0;
-const __1 = require("../");
+const utils_1 = require("../../../../../../utils");
 const ScssRule_1 = require("./ScssRule");
 class FN022002_SCSS_add_fabric_react extends ScssRule_1.ScssRule {
     constructor(importValue, addIfContains) {
@@ -31,7 +31,7 @@ class FN022002_SCSS_add_fabric_react extends ScssRule_1.ScssRule {
         return '';
     }
     visit(project, findings) {
-        if (__1.Utils.isReactProject(project) === false) {
+        if (utils_1.spfx.isReactProject(project) === false) {
             return;
         }
         if (!project.scssFiles ||