@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.04832fc

package/dist/m365/planner/commands/task/task-list.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class PlannerTaskListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_LIST;
     }
@@ -35,14 +35,14 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
                 .getBucketId(args)
                 .then((retrievedBucketId) => {
                 bucketId = retrievedBucketId;
-                return this.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`, logger, true);
+                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`, logger);
             })
-                .then(() => {
-                taskItems = this.items;
-                return this.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`, logger, true);
+                .then((tasks) => {
+                taskItems = tasks;
+                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`, logger);
             })
-                .then(() => {
-                logger.log(this.mergeTaskPriority(taskItems, this.items));
+                .then((betaTasks) => {
+                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
@@ -51,26 +51,26 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
                 .getPlanId(args)
                 .then((retrievedPlanId) => {
                 planId = retrievedPlanId;
-                return this.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`, logger, true);
+                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`, logger);
             })
-                .then(() => {
-                taskItems = this.items;
-                return this.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`, logger, true);
+                .then((tasks) => {
+                taskItems = tasks;
+                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`, logger);
             })
-                .then(() => {
-                logger.log(this.mergeTaskPriority(taskItems, this.items));
+                .then((betaTasks) => {
+                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
         else {
-            this
-                .getAllItems(`${this.resource}/v1.0/me/planner/tasks`, logger, true)
-                .then(() => {
-                taskItems = this.items;
-                return this.getAllItems(`${this.resource}/beta/me/planner/tasks`, logger, true);
+            utils_1.odata
+                .getAllItems(`${this.resource}/v1.0/me/planner/tasks`, logger)
+                .then((tasks) => {
+                taskItems = tasks;
+                return utils_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`, logger);
             })
-                .then(() => {
-                logger.log(this.mergeTaskPriority(taskItems, this.items));
+                .then((betaTasks) => {
+                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
@@ -195,7 +195,7 @@ class PlannerTaskListCommand extends GraphItemsListCommand_1.GraphItemsListComma
         if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
         }
-        if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/planner/commands/task/task-set.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskSetCommand extends GraphCommand_1.default {
@@ -162,7 +162,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         let userIds = [];
         const promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'accept ': 'application/json;odata.metadata=none'
                 },
@@ -326,13 +326,13 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
         }
-        if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
-        if (args.options.startDateTime && !Utils_1.default.isValidISODateTime(args.options.startDateTime)) {
+        if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
-        if (args.options.dueDateTime && !Utils_1.default.isValidISODateTime(args.options.dueDateTime)) {
+        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
             return 'The dueDateTime is not a valid ISO date string';
         }
         if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
@@ -341,7 +341,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
             return `percentComplete should be between 0 and 100`;
         }
-        if (args.options.assignedToUserIds && !Utils_1.default.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
         if (args.options.assignedToUserIds && args.options.assignedToUserNames) {

package/dist/m365/planner/commands.js

@@ -6,6 +6,7 @@ exports.default = {
     BUCKET_LIST: `${prefix} bucket list`,
     PLAN_ADD: `${prefix} plan add`,
     PLAN_GET: `${prefix} plan get`,
+    PLAN_DETAILS_GET: `${prefix} plan details get`,
     PLAN_LIST: `${prefix} plan list`,
     TASK_ADD: `${prefix} task add`,
     TASK_DETAILS_GET: `${prefix} task details get`,

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

@@ -5,7 +5,7 @@ const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const uuid_1 = require("uuid");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
@@ -73,8 +73,8 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
                 logger.log('Copying files...');
             }
             const src = path.join(__dirname, 'package-generate', 'assets');
-            Utils_1.default.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
-            const files = Utils_1.default.readdirR(tmpDir);
+            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...');
             }
@@ -112,7 +112,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
             if (!this.archive) {
                 this.archive = new AdmZip();
             }
-            const filesToZip = Utils_1.default.readdirR(tmpDir);
+            const filesToZip = utils_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,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/model/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/m365/spfx/commands/project/project-externalize/rules/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -16,5 +20,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/FN001033_DEP_tslib.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN001033_DEP_tslib = void 0;
+const DependencyRule_1 = require("./DependencyRule");
+class FN001033_DEP_tslib extends DependencyRule_1.DependencyRule {
+    constructor(packageVersion) {
+        super('tslib', packageVersion, false, false);
+    }
+    get id() {
+        return 'FN001033';
+    }
+}
+exports.FN001033_DEP_tslib = FN001033_DEP_tslib;
+//# sourceMappingURL=FN001033_DEP_tslib.js.map

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/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;