@microsoft/teamsfx-core 2.0.6 → 2.0.7-alpha.8120e652f.0

package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts

@@ -3,11 +3,12 @@ import { DependencyChecker } from "./dependencyChecker";
 export declare class GeneratorChecker implements DependencyChecker {
     private readonly _logger;
     constructor(logger: LogProvider);
-    ensureLatestDependency(ctx: Context): Promise<Result<boolean, FxError>>;
+    ensureDependency(ctx: Context, targetVersion: string): Promise<Result<boolean, FxError>>;
     isLatestInstalled(loadedLatestVersion: string | undefined): Promise<boolean>;
-    install(): Promise<void>;
+    findLocalInstalledVersion(): Promise<string | undefined>;
+    install(targetVersion: string): Promise<void>;
     getSpGeneratorPath(): string;
-    findGloballyInstalledVersion(timeoutInSeconds?: number): Promise<string | undefined>;
+    findGloballyInstalledVersion(timeoutInSeconds?: number, shouldThrowIfNotFind?: boolean): Promise<string | undefined>;
     findLatestVersion(timeoutInSeconds?: number): Promise<string | undefined>;
     private validate;
     private getDefaultInstallPath;

package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAYxD,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA4BvE,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAW5E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,kBAAkB,IAAI,MAAM;IAatB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIjB,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIxE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,OAAO;YAgBP,gBAAgB;CAuB/B"}
+{"version":3,"file":"generatorChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAYxD,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA2BvB,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU5E,yBAAyB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAanD,kBAAkB,IAAI,MAAM;IAatB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,EACzB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IASjB,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIxE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAeZ,OAAO;YAgBP,gBAAgB;CAuB/B"}

package/build/component/generator/spfx/depsChecker/generatorChecker.js

@@ -15,45 +15,55 @@ const cpUtils_1 = require("../../../../common/deps-checker/util/cpUtils");
 const constants_1 = require("../utils/constants");
 const utils_1 = require("../utils/utils");
 const name = constants_1.Constants.GeneratorPackageName;
-const displayName = `${name}@${constants_1.Constants.LatestVersion}`;
+const displayName = `${name}`;
 const timeout = 6 * 60 * 1000;
 class GeneratorChecker {
     constructor(logger) {
         this._logger = logger;
     }
-    async ensureLatestDependency(ctx) {
-        telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGeneratorStart);
+    async ensureDependency(ctx, targetVersion) {
+        telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureSharepointGeneratorStart);
         try {
-            void this._logger.info(`${displayName} not found, installing...`);
-            await this.install();
-            void this._logger.info(`Successfully installed ${displayName}`);
-            telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGenerator);
+            void this._logger.info(`${displayName}@${targetVersion} not found, installing...`);
+            await this.install(targetVersion);
+            void this._logger.info(`Successfully installed ${displayName}@${targetVersion}`);
+            telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureSharepointGenerator);
         }
         catch (error) {
-            telemetry_helper_1.telemetryHelper.sendErrorEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGenerator, error, {
-                [telemetryEvents_1.TelemetryProperty.EnsureLatestSharepointGeneratorReason]: error.name,
+            telemetry_helper_1.telemetryHelper.sendErrorEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureSharepointGenerator, error, {
+                [telemetryEvents_1.TelemetryProperty.EnsureSharepointGeneratorReason]: error
+                    .name,
             });
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            this._logger.error(`Failed to install ${displayName}, error = '${error}'`);
+            this._logger.error(`Failed to install ${displayName}@${targetVersion}, error = '${error}'`);
             return teamsfx_api_1.err(error);
         }
         return teamsfx_api_1.ok(true);
     }
     async isLatestInstalled(loadedLatestVersion) {
         try {
-            const generatorVersion = await this.queryVersion();
+            const generatorVersion = await this.findLocalInstalledVersion();
             const latestGeneratorVersion = loadedLatestVersion !== null && loadedLatestVersion !== void 0 ? loadedLatestVersion : (await this.findLatestVersion(5));
-            const hasSentinel = await fs.pathExists(this.getSentinelPath());
-            return !!latestGeneratorVersion && generatorVersion === latestGeneratorVersion && hasSentinel;
+            return !!latestGeneratorVersion && generatorVersion === latestGeneratorVersion;
         }
         catch (error) {
             return false;
         }
     }
-    async install() {
+    async findLocalInstalledVersion() {
+        try {
+            const generatorVersion = await this.queryVersion();
+            const hasSentinel = await fs.pathExists(this.getSentinelPath());
+            return hasSentinel ? generatorVersion : undefined;
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+    async install(targetVersion) {
         void this._logger.info("Start installing...");
         await this.cleanup();
-        await this.installGenerator();
+        await this.installGenerator(targetVersion);
         void this._logger.info("Validating package...");
         if (!(await this.validate())) {
             void this._logger.debug(`Failed to validate ${name}, cleaning up...`);
@@ -64,8 +74,8 @@ class GeneratorChecker {
     getSpGeneratorPath() {
         return `"${path.join(this.getDefaultInstallPath(), "node_modules", "@microsoft", "generator-sharepoint", "lib", "generators", "app", "index.js")}"`;
     }
-    async findGloballyInstalledVersion(timeoutInSeconds) {
-        return await utils_1.Utils.findGloballyInstalledVersion(this._logger, name, timeoutInSeconds !== null && timeoutInSeconds !== void 0 ? timeoutInSeconds : 0);
+    async findGloballyInstalledVersion(timeoutInSeconds, shouldThrowIfNotFind) {
+        return await utils_1.Utils.findGloballyInstalledVersion(this._logger, name, timeoutInSeconds !== null && timeoutInSeconds !== void 0 ? timeoutInSeconds : 0, shouldThrowIfNotFind);
     }
     async findLatestVersion(timeoutInSeconds) {
         return await utils_1.Utils.findLatestVersion(this._logger, name, timeoutInSeconds !== null && timeoutInSeconds !== void 0 ? timeoutInSeconds : 0);
@@ -103,15 +113,15 @@ class GeneratorChecker {
             this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err}`);
         }
     }
-    async installGenerator() {
+    async installGenerator(targetVersion) {
+        const version = targetVersion !== null && targetVersion !== void 0 ? targetVersion : constants_1.Constants.LatestVersion;
         try {
-            const version = constants_1.Constants.LatestVersion;
             await fs.ensureDir(path.join(this.getDefaultInstallPath(), "node_modules"));
             await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: false }, utils_1.getExecCommand("npm"), "install", `${name}@${version}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");
             await fs.ensureFile(this.getSentinelPath());
         }
         catch (error) {
-            void this._logger.error(`Failed to execute npm install ${displayName}`);
+            void this._logger.error(`Failed to execute npm install ${displayName}@${version}`);
             throw error_1.NpmInstallError(error);
         }
     }

package/build/component/generator/spfx/depsChecker/generatorChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generatorChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/generatorChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAUgC;AAEhC,gEAA4D;AAC5D,8DAA8E;AAC9E,oCAAoE;AACpE,0EAAuE;AACvE,kDAA+C;AAC/C,0CAAuD;AAEvD,MAAM,IAAI,GAAG,qBAAS,CAAC,oBAAoB,CAAC;AAC5C,MAAM,WAAW,GAAG,GAAG,IAAI,EAAE,CAAC;AAC9B,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,gBAAgB;IAG3B,YAAY,MAAmB;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,GAAY,EACZ,aAAqB;QAErB,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,8BAA8B,CAAC,CAAC;QAEtF,IAAI;YACF,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,IAAI,aAAa,2BAA2B,CAAC,CAAC;YACnF,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAClC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,0BAA0B,WAAW,IAAI,aAAa,EAAE,CAAC,CAAC;YAEjF,kCAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,iCAAe,CAAC,yBAAyB,CAAC,CAAC;SAClF;QAAC,OAAO,KAAK,EAAE;YACd,kCAAe,CAAC,cAAc,CAC5B,GAAG,EACH,iCAAe,CAAC,yBAAyB,EACzC,KAAgC,EAChC;gBACE,CAAC,mCAAiB,CAAC,+BAA+B,CAAC,EAAG,KAAiC;qBACpF,IAAI;aACR,CACF,CAAC;YACF,4EAA4E;YAC5E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,WAAW,IAAI,aAAa,cAAc,KAAK,GAAG,CAAC,CAAC;YAC5F,OAAO,iBAAG,CAAC,KAAgC,CAAC,CAAC;SAC9C;QAED,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,mBAAuC;QACpE,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAChE,MAAM,sBAAsB,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YACxF,OAAO,CAAC,CAAC,sBAAsB,IAAI,gBAAgB,KAAK,sBAAsB,CAAC;SAChF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,KAAK,CAAC,yBAAyB;QACpC,IAAI;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;YAChE,OAAO,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;SACnD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,aAAqB;QACxC,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAE3C,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAChD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC5B,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAI,kBAAkB,CAAC,CAAC;YACtE,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,+BAAuB,CAAC,IAAI,CAAC,CAAC;SACrC;IACH,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAClB,IAAI,CAAC,qBAAqB,EAAE,EAC5B,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,KAAK,EACL,UAAU,CACX,GAAG,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,gBAAyB,EACzB,oBAA8B;QAE9B,OAAO,MAAM,aAAK,CAAC,4BAA4B,CAC7C,IAAI,CAAC,OAAO,EACZ,IAAI,EACJ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,EACrB,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,gBAAyB;QACtD,OAAO,MAAM,aAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC,CAAC,CAAC;IAClF,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACrD,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;IAC/E,CAAC;IAEO,eAAe;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,YAAY;;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAC3B,IAAI,CAAC,qBAAqB,EAAE,EAC5B,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,cAAc,CACf,CAAC;QACF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACpC,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnD,OAAO,MAAA,WAAW,CAAC,OAAO,mCAAI,SAAS,CAAC;SACzC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI;YACF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACvF,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;gBAClC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;gBACnC,MAAM,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;aACjC;YAED,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;YAChD,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SACzC;QAAC,OAAO,GAAG,EAAE;YACZ,4EAA4E;YAC5E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,qBAAqB,EAAE,YAAY,GAAG,EAAE,CAAC,CAAC;SAC/F;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,aAAqB;QAClD,MAAM,OAAO,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,qBAAS,CAAC,aAAa,CAAC;QACzD,IAAI;YACF,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;YAC5E,MAAM,iBAAO,CAAC,cAAc,CAC1B,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAClC,sBAAc,CAAC,KAAK,CAAC,EACrB,SAAS,EACT,GAAG,IAAI,IAAI,OAAO,EAAE,EACpB,UAAU,EACV,GAAG,IAAI,CAAC,qBAAqB,EAAE,EAAE,EACjC,YAAY,EACZ,gBAAgB,CACjB,CAAC;YAEF,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iCAAiC,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC;YACnF,MAAM,uBAAe,CAAC,KAAc,CAAC,CAAC;SACvC;IACH,CAAC;CACF;AArKD,4CAqKC"}

package/build/component/generator/spfx/depsChecker/yoChecker.d.ts

@@ -3,9 +3,10 @@ import { DependencyChecker } from "./dependencyChecker";
 export declare class YoChecker implements DependencyChecker {
     private readonly _logger;
     constructor(logger: LogProvider);
-    ensureLatestDependency(ctx: Context): Promise<Result<boolean, FxError>>;
+    ensureDependency(ctx: Context, targetVersion: string): Promise<Result<boolean, FxError>>;
+    findLocalInstalledVersion(): Promise<string | undefined>;
     isLatestInstalled(): Promise<boolean>;
-    install(): Promise<void>;
+    install(targetVersion: string): Promise<void>;
     getBinFolders(): string[];
     findGloballyInstalledVersion(timeoutInSeconds?: number): Promise<string | undefined>;
     findLatestVersion(timeoutInSeconds: number): Promise<string | undefined>;

package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"yoChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAYxD,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA0BvE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAWrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B,aAAa,IAAI,MAAM,EAAE;IAKnB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIjB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIvE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAcZ,OAAO;YAoCP,SAAS;CAuBxB"}
+{"version":3,"file":"yoChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,WAAW,EAEX,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAYxD,qBAAa,SAAU,YAAW,iBAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,MAAM,EAAE,WAAW;IAIlB,gBAAgB,CAC3B,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IA0BvB,yBAAyB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAUrC,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAanD,aAAa,IAAI,MAAM,EAAE;IAKnB,4BAA4B,CACvC,gBAAgB,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIjB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAIvE,QAAQ;IAItB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,YAAY;YAcZ,OAAO;YAoCP,SAAS;CAuBxB"}

package/build/component/generator/spfx/depsChecker/yoChecker.js

@@ -15,44 +15,53 @@ const cpUtils_1 = require("../../../../common/deps-checker/util/cpUtils");
 const utils_1 = require("../utils/utils");
 const constants_1 = require("../utils/constants");
 const name = constants_1.Constants.YeomanPackageName;
-const displayName = `${name}@${constants_1.Constants.LatestVersion}`;
+const displayName = `${name}`;
 const timeout = 6 * 60 * 1000;
 class YoChecker {
     constructor(logger) {
         this._logger = logger;
     }
-    async ensureLatestDependency(ctx) {
-        telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYoStart);
+    async ensureDependency(ctx, targetVersion) {
+        telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureYoStart);
         try {
-            void this._logger.info(`${displayName} not found, installing...`);
-            await this.install();
-            void this._logger.info(`Successfully installed ${displayName}`);
-            telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYo);
+            void this._logger.info(`${displayName}@${targetVersion} not found, installing...`);
+            await this.install(targetVersion);
+            void this._logger.info(`Successfully installed ${displayName}@${targetVersion}`);
+            telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureYo);
         }
         catch (error) {
-            telemetry_helper_1.telemetryHelper.sendErrorEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestYo, error, {
-                [telemetryEvents_1.TelemetryProperty.EnsureLatestYoReason]: error.name,
+            telemetry_helper_1.telemetryHelper.sendErrorEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureYo, error, {
+                [telemetryEvents_1.TelemetryProperty.EnsureYoReason]: error.name,
             });
-            this._logger.error(`Failed to install ${displayName}, error = '${error.toString()}'`);
+            this._logger.error(`Failed to install ${displayName}@${targetVersion}, error = '${error.toString()}'`);
             return teamsfx_api_1.err(error);
         }
         return teamsfx_api_1.ok(true);
     }
-    async isLatestInstalled() {
+    async findLocalInstalledVersion() {
         try {
             const yoVersion = await this.queryVersion();
-            const latestYeomanVersion = await this.findLatestVersion(10);
             const hasSentinel = await fs_extra_1.default.pathExists(this.getSentinelPath());
-            return !!latestYeomanVersion && yoVersion === latestYeomanVersion && hasSentinel;
+            return hasSentinel ? yoVersion : undefined;
+        }
+        catch (error) {
+            return undefined;
+        }
+    }
+    async isLatestInstalled() {
+        try {
+            const yoVersion = await this.findLocalInstalledVersion();
+            const latestYeomanVersion = await this.findLatestVersion(10);
+            return !!latestYeomanVersion && yoVersion === latestYeomanVersion;
         }
         catch (error) {
             return false;
         }
     }
-    async install() {
+    async install(targetVersion) {
         void this._logger.info("Start installing...");
         await this.cleanup();
-        await this.installYo();
+        await this.installYo(targetVersion);
         void this._logger.info("Validating package...");
         if (!(await this.validate())) {
             void this._logger.debug("Failed to validate yo, cleaning up...");
@@ -116,15 +125,15 @@ class YoChecker {
             this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err.toString()}`);
         }
     }
-    async installYo() {
+    async installYo(targetVersion) {
+        const version = targetVersion !== null && targetVersion !== void 0 ? targetVersion : constants_1.Constants.LatestVersion;
         try {
-            const version = constants_1.Constants.LatestVersion;
             await fs_extra_1.default.ensureDir(path.join(this.getDefaultInstallPath(), "node_modules"));
             await cpUtils_1.cpUtils.executeCommand(undefined, this._logger, { timeout: timeout, shell: false }, utils_1.getExecCommand("npm"), "install", `${name}@${version}`, "--prefix", `${this.getDefaultInstallPath()}`, "--no-audit", "--global-style");
             await fs_extra_1.default.ensureFile(this.getSentinelPath());
         }
         catch (error) {
-            void this._logger.error("Failed to execute npm install yo");
+            void this._logger.error(`Failed to execute npm install ${displayName}@${version}`);
             throw error_1.NpmInstallError(error);
         }
     }

package/build/component/generator/spfx/depsChecker/yoChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"yoChecker.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/yoChecker.ts"],"names":[],"mappings":"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"}

package/build/component/generator/spfx/error.d.ts

@@ -4,10 +4,12 @@ export declare function NpmInstallError(error: Error): SystemError;
 export declare function DependencyValidateError(dependency: string): SystemError;
 export declare function DevEnvironmentSetupError(): UserError;
 export declare function LatestPackageInstallError(): SystemError;
+export declare function PackageTargetVersionInstallError(packageName: string, version: string): SystemError;
 export declare function YoGeneratorScaffoldError(): UserError;
 export declare function CopyExistingSPFxSolutionError(e: Error): UserError;
 export declare function RetrieveSPFxInfoError(): UserError;
 export declare function UpdateSPFxTemplateError(e: Error): UserError;
 export declare function ImportSPFxSolutionError(e: Error): UserError;
 export declare function PathAlreadyExistsError(path: string): UserError;
+export declare function SolutionVersionMissingError(path: string): UserError;
 //# sourceMappingURL=error.d.ts.map

package/build/component/generator/spfx/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIhE,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,WAAW,CAUnE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAOzD;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAOvE;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,yBAAyB,IAAI,WAAW,CAgBvD;AAED,wBAAgB,gCAAgC,CAC9C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,GACd,WAAW,CAmBb;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAcpD;AAED,wBAAgB,6BAA6B,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQjE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,KAAK,GAAG,SAAS,CAQ3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAO9D;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAOnE"}

package/build/component/generator/spfx/error.js

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
+exports.SolutionVersionMissingError = exports.PathAlreadyExistsError = exports.ImportSPFxSolutionError = exports.UpdateSPFxTemplateError = exports.RetrieveSPFxInfoError = exports.CopyExistingSPFxSolutionError = exports.YoGeneratorScaffoldError = exports.PackageTargetVersionInstallError = exports.LatestPackageInstallError = exports.DevEnvironmentSetupError = exports.DependencyValidateError = exports.NpmInstallError = exports.ScaffoldError = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("./utils/constants");
 const localizeUtils_1 = require("../../../common/localizeUtils");
@@ -42,6 +42,12 @@ function LatestPackageInstallError() {
     return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "LatestPackageInstallFailed", localizeUtils_1.getDefaultString("plugins.spfx.error.installLatestDependencyError", fxFolderPath, constants_1.Constants.SetUpDevEnvironmentHelpLink), localizeUtils_1.getLocalizedString("plugins.spfx.error.installLatestDependencyError", fxFolderPath, constants_1.Constants.SetUpDevEnvironmentHelpLink));
 }
 exports.LatestPackageInstallError = LatestPackageInstallError;
+function PackageTargetVersionInstallError(packageName, version) {
+    const fxFolderPath = "HOME/.fx";
+    const packageInfo = `${packageName}@${version}`;
+    return new teamsfx_api_1.SystemError(constants_1.Constants.PLUGIN_NAME, "PackageTargetVersionInstallError", localizeUtils_1.getDefaultString("plugins.spfx.error.installDependencyError", fxFolderPath, constants_1.Constants.AddWebpartHelpLink, packageInfo), localizeUtils_1.getLocalizedString("plugins.spfx.error.installDependencyError", fxFolderPath, constants_1.Constants.AddWebpartHelpLink, packageInfo));
+}
+exports.PackageTargetVersionInstallError = PackageTargetVersionInstallError;
 function YoGeneratorScaffoldError() {
     return new teamsfx_api_1.UserError({
         source: constants_1.Constants.PLUGIN_NAME,
@@ -101,4 +107,13 @@ function PathAlreadyExistsError(path) {
     });
 }
 exports.PathAlreadyExistsError = PathAlreadyExistsError;
+function SolutionVersionMissingError(path) {
+    return new teamsfx_api_1.UserError({
+        source: constants_1.Constants.PLUGIN_NAME,
+        name: "SolutionVersionMissing",
+        message: localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.cannotFindSolutionVersion", path),
+        displayMessage: localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.cannotFindSolutionVersion", path),
+    });
+}
+exports.SolutionVersionMissingError = SolutionVersionMissingError;
 //# sourceMappingURL=error.js.map

package/build/component/generator/spfx/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/component/generator/spfx/error.ts"],"names":[],"mappings":"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"}

package/build/component/generator/spfx/spfxGenerator.d.ts

@@ -6,6 +6,9 @@ export declare class SPFxGenerator {
     private static importSPFxProject;
     static doYeomanScaffold(context: Context, inputs: Inputs, destinationPath: string): Promise<Result<string, FxError>>;
     static getSolutionName(spfxFolder: string): Promise<string | undefined>;
+    private static getSolutionVersion;
+    private static ensureLocalDependencies;
+    private static shouldAddWebPartWithLocalDependencies;
     private static copySPFxSolution;
     private static getWebpartManifest;
     private static updateSPFxTemplate;

package/build/component/generator/spfx/spfxGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAKN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAqBtF,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WA8GlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WAqLf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,gBAAgB;mBAehB,kBAAkB;mBAoClB,kBAAkB;CAqKxC"}
+{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/spfx/spfxGenerator.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,MAAM,EAMN,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAqB,MAAM,oCAAoC,CAAC;AAuBtF,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAajB,cAAc;mBAmBd,iBAAiB;WA8GlB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;WAgMf,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;mBAa/D,kBAAkB;mBAYlB,uBAAuB;mBAsEvB,qCAAqC;mBA0HrC,gBAAgB;mBAehB,kBAAkB;mBAoClB,kBAAkB;CAqKxC"}

package/build/component/generator/spfx/spfxGenerator.js

@@ -120,7 +120,7 @@ class SPFxGenerator {
         var _a, _b;
         const ui = context.userInteraction;
         const progressHandler = await progress_helper_1.ProgressHelper.startScaffoldProgressHandler(ui, inputs.stage == teamsfx_api_1.Stage.addWebpart);
-        const shouldInstallLocally = inputs[questionNames_1.QuestionNames.SPFxInstallPackage] === create_1.SPFxVersionOptionIds.installLocally;
+        let shouldInstallLocally = inputs[questionNames_1.QuestionNames.SPFxInstallPackage] === create_1.SPFxVersionOptionIds.installLocally;
         try {
             const webpartName = inputs[questionNames_1.QuestionNames.SPFxWebpartName];
             const framework = inputs[questionNames_1.QuestionNames.SPFxFramework];
@@ -131,28 +131,28 @@ class SPFxGenerator {
             await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyCheck")));
             const yoChecker = new yoChecker_1.YoChecker(context.logProvider);
             const spGeneratorChecker = new generatorChecker_1.GeneratorChecker(context.logProvider);
-            if (shouldInstallLocally) {
-                const latestYoInstalled = await yoChecker.isLatestInstalled();
-                const latestGeneratorInstalled = await spGeneratorChecker.isLatestInstalled(inputs.latestSpfxPackageVersion);
-                if (!latestYoInstalled || !latestGeneratorInstalled) {
-                    await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyInstall")));
-                    if (!latestYoInstalled) {
-                        const yoRes = await yoChecker.ensureLatestDependency(context);
-                        if (yoRes.isErr()) {
-                            throw error_2.LatestPackageInstallError();
-                        }
-                    }
-                    if (!latestGeneratorInstalled) {
-                        const spGeneratorRes = await spGeneratorChecker.ensureLatestDependency(context);
-                        if (spGeneratorRes.isErr()) {
-                            throw error_2.LatestPackageInstallError();
-                        }
-                    }
+            let targetVersion = constants_2.Constants.LatestVersion;
+            let localVersion = undefined;
+            if (isAddSPFx) {
+                const yoInfoPath = path.join(inputs[questionNames_1.QuestionNames.SPFxFolder], constants_2.Constants.YO_RC_FILE);
+                targetVersion = await this.getSolutionVersion(yoInfoPath);
+                if (!targetVersion) {
+                    context.logProvider.error(localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.cannotFindSolutionVersion", yoInfoPath));
+                    throw error_2.SolutionVersionMissingError(yoInfoPath);
                 }
+                const versions = await Promise.all([
+                    spGeneratorChecker.findLocalInstalledVersion(),
+                    spGeneratorChecker.findGloballyInstalledVersion(undefined, false),
+                ]);
+                localVersion = versions[0];
+                shouldInstallLocally = await this.shouldAddWebPartWithLocalDependencies(targetVersion, versions[1], localVersion, context);
+            }
+            if (shouldInstallLocally) {
+                await this.ensureLocalDependencies(targetVersion, localVersion, inputs, context, yoChecker, spGeneratorChecker, progressHandler);
             }
             else {
                 const isLowerVersion = !!inputs.globalSpfxPackageVersion &&
-                    semver_1.default.lte(inputs.globalSpfxPackageVersion, constants_2.Constants.RecommendedLowestSpfxVersion.substring(1));
+                    semver_1.default.lt(inputs.globalSpfxPackageVersion, constants_2.Constants.RecommendedLowestSpfxVersion.substring(1));
                 if (isLowerVersion) {
                     context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.UseNotRecommendedVersion);
                 }
@@ -249,7 +249,7 @@ class SPFxGenerator {
         }
     }
     static async getSolutionName(spfxFolder) {
-        const yoInfoPath = path.join(spfxFolder, ".yo-rc.json");
+        const yoInfoPath = path.join(spfxFolder, constants_2.Constants.YO_RC_FILE);
         if (await fs_extra_1.default.pathExists(yoInfoPath)) {
             const yoInfo = await fs_extra_1.default.readJson(yoInfoPath);
             if (yoInfo["@microsoft/generator-sharepoint"]) {
@@ -261,6 +261,135 @@ class SPFxGenerator {
         }
         return undefined;
     }
+    static async getSolutionVersion(yoInfoPath) {
+        if (await fs_extra_1.default.pathExists(yoInfoPath)) {
+            const yoInfo = await fs_extra_1.default.readJson(yoInfoPath);
+            if (yoInfo["@microsoft/generator-sharepoint"]) {
+                return yoInfo["@microsoft/generator-sharepoint"][constants_2.Constants.YO_RC_VERSION];
+            }
+        }
+        else {
+            throw new error_1.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, yoInfoPath);
+        }
+        return "";
+    }
+    static async ensureLocalDependencies(targetSPFxVersion, localSPFxVersion, inputs, context, yoChecker, spGeneratorChecker, progressHandler) {
+        let needInstallYo = false;
+        let needInstallGenerator = false;
+        const isAddWebPart = targetSPFxVersion !== constants_2.Constants.LatestVersion;
+        // yo
+        if (!isAddWebPart) {
+            const latestYoInstalled = await yoChecker.isLatestInstalled();
+            needInstallYo = !latestYoInstalled;
+        }
+        else {
+            const localYoVersion = await yoChecker.findLocalInstalledVersion();
+            needInstallYo = !localYoVersion;
+        }
+        // spfx generator
+        if (!isAddWebPart) {
+            const latestGeneratorInstalled = await spGeneratorChecker.isLatestInstalled(inputs.latestSpfxPackageVersion);
+            needInstallGenerator = !latestGeneratorInstalled;
+        }
+        else {
+            // we have check and confirmed with user before install/upgrade dependencies for user
+            needInstallGenerator = !localSPFxVersion || semver_1.default.lt(localSPFxVersion, targetSPFxVersion);
+        }
+        if (needInstallYo || needInstallGenerator) {
+            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyInstall")));
+            if (needInstallYo) {
+                const yoRes = await yoChecker.ensureDependency(context, constants_2.Constants.LatestVersion);
+                if (yoRes.isErr()) {
+                    if (isAddWebPart) {
+                        throw error_2.PackageTargetVersionInstallError(constants_2.Constants.YeomanPackageName, constants_2.Constants.LatestVersion);
+                    }
+                    else {
+                        throw error_2.LatestPackageInstallError();
+                    }
+                }
+            }
+            if (needInstallGenerator) {
+                const spGeneratorRes = await spGeneratorChecker.ensureDependency(context, targetSPFxVersion);
+                if (spGeneratorRes.isErr()) {
+                    if (isAddWebPart) {
+                        throw error_2.PackageTargetVersionInstallError(constants_2.Constants.GeneratorPackageName, targetSPFxVersion);
+                    }
+                    else {
+                        throw error_2.LatestPackageInstallError();
+                    }
+                }
+            }
+        }
+    }
+    // return shouldUseLocal
+    static async shouldAddWebPartWithLocalDependencies(solutionVersion, globalVersion, localVersion, context) {
+        if (globalVersion === solutionVersion) {
+            // use globally installed pacakge to add web part
+            context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
+                [telemetryEvents_1.TelemetryProperty.PackageSource]: "global",
+            });
+            return false;
+        }
+        if (localVersion === solutionVersion) {
+            // use locally installed package to add web part
+            context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
+                [telemetryEvents_1.TelemetryProperty.PackageSource]: "local",
+                [telemetryEvents_1.TelemetryProperty.UserAction]: "none",
+            });
+            return true;
+        }
+        const displayedSolutionVersion = `v${solutionVersion}`;
+        const displayedLocalVersion = localVersion ? `v${localVersion}` : undefined;
+        const displayedGlobalVersion = globalVersion ? `v${globalVersion}` : undefined;
+        let userAnswer;
+        let continueText;
+        let defaultContinueText;
+        if (!localVersion) {
+            // ask user to confirm to install locally
+            continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.install");
+            defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.install");
+            const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.confirmInstall", displayedSolutionVersion, displayedSolutionVersion), true, continueText);
+            userAnswer = res.isOk() ? res.value : undefined;
+        }
+        else if (semver_1.default.lt(localVersion, solutionVersion)) {
+            // ask user to confirm to upgrade local SPFx
+            continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.upgrade");
+            defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.upgrade");
+            const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.confirmUpgrade", displayedLocalVersion, displayedSolutionVersion, displayedSolutionVersion), true, continueText);
+            userAnswer = res.isOk() ? res.value : undefined;
+        }
+        else {
+            // localVersion > solutionVersion
+            // ask user to confirm to continue, learn more or cancel
+            continueText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.continue");
+            defaultContinueText = localizeUtils_1.getDefaultString("plugins.spfx.addWebPart.versionMismatch.continue");
+            let userSelected;
+            const helpText = localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.help");
+            do {
+                const res = await context.userInteraction.showMessage("info", localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.continueConfirm", displayedSolutionVersion, displayedLocalVersion), true, helpText, continueText);
+                userSelected = res.isOk() ? res.value : undefined;
+                if (userSelected === helpText) {
+                    context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.LearnMoreVersionMismatch);
+                    void context.userInteraction.openUrl(constants_2.Constants.AddWebpartHelpLink);
+                }
+            } while (userSelected === helpText);
+            userAnswer = userSelected;
+            context.logProvider.log(teamsfx_api_1.LogLevel.Warning, displayedGlobalVersion
+                ? localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.output", displayedSolutionVersion, displayedGlobalVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink)
+                : localizeUtils_1.getLocalizedString("plugins.spfx.addWebPart.versionMismatch.localOnly.output", displayedSolutionVersion, displayedLocalVersion, displayedLocalVersion, constants_2.Constants.AddWebpartHelpLink));
+        }
+        context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.CheckAddWebPartPackage, {
+            [telemetryEvents_1.TelemetryProperty.PackageSource]: "local",
+            [telemetryEvents_1.TelemetryProperty.UserAction]: defaultContinueText,
+            [telemetryEvents_1.TelemetryProperty.ConfirmAddWebPartResult]: !userAnswer ? "Cancel" : defaultContinueText,
+        });
+        if (userAnswer !== continueText) {
+            throw new error_1.UserCancelError(constants_2.Constants.PLUGIN_NAME);
+        }
+        else {
+            return true;
+        }
+    }
     static async copySPFxSolution(src, dest) {
         try {
             await fs_extra_1.default.ensureDir(dest);