@microsoft/teamsfx-core 2.0.6 → 2.0.7-alpha.07c4fbf2b.0

package/build/component/generator/generatorAction.d.ts

@@ -4,6 +4,7 @@ import { LogProvider } from "@microsoft/teamsfx-api";
 import { SampleUrlInfo } from "./utils";
 export interface GeneratorContext {
     name: string;
+    language?: string;
     destination: string;
     logProvider: LogProvider;
     tryLimits?: number;
@@ -19,7 +20,7 @@ export interface GeneratorContext {
     fileDataReplaceFn?: (name: string, data: Buffer) => Buffer | string;
     onActionStart?: (action: GeneratorAction, context: GeneratorContext) => Promise<void>;
     onActionEnd?: (action: GeneratorAction, context: GeneratorContext) => Promise<void>;
-    onActionError?: (action: GeneratorAction, context: GeneratorContext, error: Error) => Promise<void>;
+    onActionError: (action: GeneratorAction, context: GeneratorContext, error: Error) => Promise<void>;
 }
 export interface GeneratorAction {
     name: string;
@@ -30,10 +31,12 @@ export declare enum GeneratorActionName {
     FetchTemplateUrlWithTag = "FetchTemplatesUrlWithTag",
     FetchZipFromUrl = "FetchZipFromUrl",
     FetchTemplateZipFromLocal = "FetchTemplateZipFromLocal",
+    FetchSampleInfo = "FetchSampleInfo",
     DownloadDirectory = "DownloadDirectory",
     Unzip = "Unzip"
 }
 export declare const fetchTemplateZipFromSourceCodeAction: GeneratorAction;
+export declare const fetchSampleInfoAction: GeneratorAction;
 export declare const downloadDirectoryAction: GeneratorAction;
 export declare const fetchTemplateUrlWithTagAction: GeneratorAction;
 export declare const fetchZipFromUrlAction: GeneratorAction;

package/build/component/generator/generatorAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAI7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,OAAO,EAIL,aAAa,EAGd,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACrC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,CAAC,EAAE,CACd,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,8BAA8B,yCAAyC;IACvE,uBAAuB,6BAA6B;IACpD,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAGD,eAAO,MAAM,oCAAoC,EAAE,eA4BlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAUrC,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAU3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAanC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,eAsB1C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAezB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAM9C,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAAe,EAAyC,CAAC;AACvF,eAAO,MAAM,0BAA0B,EAAE,eAAe,EAA8B,CAAC"}
+{"version":3,"file":"generatorAction.d.ts","sourceRoot":"","sources":["../../../src/component/generator/generatorAction.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAI7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,OAAO,EAKL,aAAa,EAGd,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACrC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3D,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC;IAEpE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpF,aAAa,EAAE,CACb,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD;AAED,oBAAY,mBAAmB;IAC7B,8BAA8B,yCAAyC;IACvE,uBAAuB,6BAA6B;IACpD,eAAe,oBAAoB;IACnC,yBAAyB,8BAA8B;IACvD,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,KAAK,UAAU;CAChB;AAGD,eAAO,MAAM,oCAAoC,EAAE,eA4BlD,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAMnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAarC,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAc3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAanC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,eAyB1C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAezB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAM9C,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAAe,EAAyC,CAAC;AACvF,eAAO,MAAM,0BAA0B,EAAE,eAAe,EAGvD,CAAC"}

package/build/component/generator/generatorAction.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DownloadDirectoryActionSeq = exports.SampleActionSeq = exports.TemplateActionSeq = exports.unzipAction = exports.fetchTemplateFromLocalAction = exports.fetchZipFromUrlAction = exports.fetchTemplateUrlWithTagAction = exports.downloadDirectoryAction = exports.fetchTemplateZipFromSourceCodeAction = exports.GeneratorActionName = void 0;
+exports.DownloadDirectoryActionSeq = exports.SampleActionSeq = exports.TemplateActionSeq = exports.unzipAction = exports.fetchTemplateFromLocalAction = exports.fetchZipFromUrlAction = exports.fetchTemplateUrlWithTagAction = exports.downloadDirectoryAction = exports.fetchSampleInfoAction = exports.fetchTemplateZipFromSourceCodeAction = exports.GeneratorActionName = void 0;
 const tslib_1 = require("tslib");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -17,6 +17,7 @@ var GeneratorActionName;
     GeneratorActionName["FetchTemplateUrlWithTag"] = "FetchTemplatesUrlWithTag";
     GeneratorActionName["FetchZipFromUrl"] = "FetchZipFromUrl";
     GeneratorActionName["FetchTemplateZipFromLocal"] = "FetchTemplateZipFromLocal";
+    GeneratorActionName["FetchSampleInfo"] = "FetchSampleInfo";
     GeneratorActionName["DownloadDirectory"] = "DownloadDirectory";
     GeneratorActionName["Unzip"] = "Unzip";
 })(GeneratorActionName = exports.GeneratorActionName || (exports.GeneratorActionName = {}));
@@ -36,19 +37,30 @@ exports.fetchTemplateZipFromSourceCodeAction = {
         }
         context.logProvider.debug(`Fetching template zip from source code: ${JSON.stringify(context)}`);
         //! This path only works in debug mode
-        const templateSourceCodePath = path_1.default.resolve(__dirname, "../../../../../", "templates", context.name);
+        const templateSourceCodePath = path_1.default.resolve(__dirname, "../../../../../", "templates", context.language);
         context.zip = utils_1.zipFolder(templateSourceCodePath);
         return Promise.resolve();
     },
 };
+exports.fetchSampleInfoAction = {
+    name: GeneratorActionName.FetchSampleInfo,
+    run: async (context) => {
+        const sample = await utils_1.getSampleInfoFromName(context.name);
+        context.sampleInfo = sample.downloadUrlInfo;
+    },
+};
 exports.downloadDirectoryAction = {
     name: GeneratorActionName.DownloadDirectory,
     run: async (context) => {
+        var _a;
         context.logProvider.debug(`Downloading sample by directory: ${JSON.stringify(context)}`);
         if (!context.sampleInfo) {
             throw new error_1.MissKeyError("sampleInfo");
         }
         context.outputs = await utils_1.downloadDirectory(context.sampleInfo, context.destination);
+        if (!((_a = context.outputs) === null || _a === void 0 ? void 0 : _a.length)) {
+            throw new error_1.SampleNotFoundError(context.name);
+        }
     },
 };
 exports.fetchTemplateUrlWithTagAction = {
@@ -58,7 +70,7 @@ exports.fetchTemplateUrlWithTagAction = {
             return;
         }
         context.logProvider.debug(`Fetching template url with tag: ${JSON.stringify(context)}`);
-        context.url = await utils_1.fetchTemplateZipUrl(context.name, context.tryLimits, context.timeoutInMs);
+        context.url = await utils_1.fetchTemplateZipUrl(context.language, context.tryLimits, context.timeoutInMs);
     },
 };
 exports.fetchZipFromUrlAction = {
@@ -77,18 +89,21 @@ exports.fetchZipFromUrlAction = {
 exports.fetchTemplateFromLocalAction = {
     name: GeneratorActionName.FetchTemplateZipFromLocal,
     run: async (context) => {
-        var _a;
+        var _a, _b;
         if ((_a = context.outputs) === null || _a === void 0 ? void 0 : _a.length) {
             return;
         }
         context.logProvider.debug(`Fetching zip from local: ${JSON.stringify(context)}`);
         context.fallback = true;
         const fallbackPath = path_1.default.join(folder_1.getTemplatesFolder(), "fallback");
-        const fileName = `${context.name}.zip`;
+        const fileName = `${context.language}.zip`;
         const zipPath = path_1.default.join(fallbackPath, fileName);
         const data = await fs_extra_1.default.readFile(zipPath);
         context.zip = new adm_zip_1.default(data);
         context.outputs = await utils_1.unzip(context.zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
+        if (!((_b = context.outputs) === null || _b === void 0 ? void 0 : _b.length)) {
+            throw new error_1.TemplateNotFoundError(context.name);
+        }
     },
 };
 exports.unzipAction = {
@@ -109,5 +124,8 @@ exports.TemplateActionSeq = [
     exports.fetchTemplateFromLocalAction,
 ];
 exports.SampleActionSeq = [exports.fetchZipFromUrlAction, exports.unzipAction];
-exports.DownloadDirectoryActionSeq = [exports.downloadDirectoryAction];
+exports.DownloadDirectoryActionSeq = [
+    exports.fetchSampleInfoAction,
+    exports.downloadDirectoryAction,
+];
 //# sourceMappingURL=generatorAction.js.map

package/build/component/generator/generatorAction.js.map

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

package/build/component/generator/officeAddin/helperMethods.js

@@ -7,45 +7,46 @@ const tslib_1 = require("tslib");
 /**
  * @author darrmill@microsoft.com, yefuwang@microsoft.com
  */
-const axios_1 = tslib_1.__importDefault(require("axios"));
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const unzip = tslib_1.__importStar(require("unzipper"));
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const zipFile = "project.zip";
 class HelperMethods {
     static async downloadProjectTemplateZipFile(projectFolder, projectRepo, projectBranch) {
         const projectTemplateZipFile = `${projectRepo}/archive/${projectBranch || ""}.zip`;
-        return axios_1.default
-            .get(projectTemplateZipFile, {
-            responseType: "stream",
-        })
-            .then((response) => {
-            return new Promise((resolve, reject) => {
-                response.data
-                    .pipe(fs_1.default.createWriteStream(`${projectFolder}/${zipFile}`))
-                    .on("error", function (err) {
+        const response = await node_fetch_1.default(projectTemplateZipFile, { method: "GET" });
+        return new Promise((resolve, reject) => {
+            if (response.body) {
+                response.body
+                    .pipe(fs_1.default.createWriteStream(path.resolve(projectFolder, zipFile)))
+                    .on("error", (err) => {
                     reject(
                     // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                     `Unable to download project zip file for "${projectTemplateZipFile}".\n${err}`);
                 })
-                    .on("close", async () => {
-                    await HelperMethods.unzipProjectTemplate(projectFolder);
-                    resolve();
+                    .on("close", () => {
+                    HelperMethods.unzipProjectTemplate(projectFolder)
+                        .then(() => {
+                        resolve();
+                    })
+                        .catch((err) => {
+                        reject(err);
+                    });
                 });
-            });
-        })
-            .catch((err) => {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            console.log(`Unable to download project zip file for "${projectTemplateZipFile}".\n${err}`);
+            }
+            else {
+                reject(`Response body is null.`);
+            }
         });
     }
     static async unzipProjectTemplate(projectFolder) {
         return new Promise((resolve, reject) => {
             // TODO: Verify file exists
-            const readStream = fs_1.default.createReadStream(`${projectFolder}/${zipFile}`);
+            const readStream = fs_1.default.createReadStream(path.resolve(`${projectFolder}/${zipFile}`));
             readStream
                 .pipe(unzip.Extract({ path: projectFolder }))
                 .on("error", function (err) {

package/build/component/generator/officeAddin/helperMethods.js.map

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

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

@@ -1,4 +1,4 @@
 export interface DependencyChecker {
-    install(): Promise<void>;
+    install(targetVersion: string): Promise<void>;
 }
 //# sourceMappingURL=dependencyChecker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dependencyChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/dependencyChecker.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
+{"version":3,"file":"dependencyChecker.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/depsChecker/dependencyChecker.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C"}

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"}