@microsoft/teamsfx-core 2.0.4-alpha.dc097d3df.0 → 2.0.4-alpha.e432bab97.0

package/build/component/generator/generator.js

@@ -19,10 +19,12 @@ const generatorAction_1 = require("./generatorAction");
 const utils_2 = require("./utils");
 class Generator {
     static getDefaultVariables(appName, safeProjectNameFromVS) {
+        const safeProjectName = safeProjectNameFromVS !== null && safeProjectNameFromVS !== void 0 ? safeProjectNameFromVS : utils_1.convertToAlphanumericOnly(appName);
         return {
             appName: appName,
             ProjectName: appName,
-            SafeProjectName: safeProjectNameFromVS !== null && safeProjectNameFromVS !== void 0 ? safeProjectNameFromVS : utils_1.convertToAlphanumericOnly(appName),
+            SafeProjectName: safeProjectName,
+            SafeProjectNameLowerCase: safeProjectName.toLocaleLowerCase(),
         };
     }
     static async generateTemplate(ctx, destinationPath, scenario, language, actionContext) {
@@ -37,10 +39,12 @@ class Generator {
             fileDataReplaceFn: (fileName, fileData) => utils_2.renderTemplateFileData(fileName, fileData, replaceMap),
             onActionError: templateDefaultOnActionError,
         };
+        const templateName = `${scenario}-${generatorContext.name}`;
         lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
-            [telemetry_1.TelemetryProperty.TemplateName]: `${scenario}-${generatorContext.name}`,
+            [telemetry_1.TelemetryProperty.TemplateName]: templateName,
         });
-        await ((_b = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _b === void 0 ? void 0 : _b.next(messages_1.ProgressMessages.generateTemplate(scenario)));
+        await ((_b = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _b === void 0 ? void 0 : _b.next(messages_1.ProgressMessages.generateTemplate));
+        ctx.logProvider.verbose(`Downloading app template "${templateName}" to ${destinationPath}`);
         await this.generate(generatorContext, generatorAction_1.TemplateActionSeq);
         lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
             [telemetry_1.TelemetryProperty.Fallback]: generatorContext.fallback ? "true" : "false", // Track fallback cases.
@@ -48,9 +52,9 @@ class Generator {
         return teamsfx_api_1.ok(undefined);
     }
     static async generateSample(ctx, destinationPath, sampleName, actionContext) {
-        var _a, _b;
+        var _a;
         lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
-            [telemetry_1.TelemetryProperty.SampleName]: sampleName,
+            [telemetry_1.TelemetryProperty.SampleAppName]: sampleName,
             [telemetry_1.TelemetryProperty.SampleDownloadDirectory]: "true",
         });
         const sample = utils_2.getSampleInfoFromName(sampleName);
@@ -59,12 +63,11 @@ class Generator {
             name: sampleName,
             destination: destinationPath,
             logProvider: ctx.logProvider,
-            url: sample.url,
+            url: sample.downloadUrl,
             timeoutInMs: constant_1.sampleDefaultTimeoutInMs,
-            relativePath: (_a = sample.relativePath) !== null && _a !== void 0 ? _a : utils_2.getSampleRelativePath(sampleName),
             onActionError: sampleDefaultOnActionError,
         };
-        await ((_b = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _b === void 0 ? void 0 : _b.next(messages_1.ProgressMessages.generateSample(sampleName)));
+        await ((_a = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.generateSample(sampleName)));
         const actionSeq = generatorAction_1.DownloadDirectoryActionSeq;
         await this.generate(generatorContext, actionSeq);
         return teamsfx_api_1.ok(undefined);
@@ -91,7 +94,7 @@ tslib_1.__decorate([
     lib_1.hooks([
         actionExecutionMW_1.ActionExecutionMW({
             enableProgressBar: true,
-            progressTitle: messages_1.ProgressTitles.generateTemplate,
+            progressTitle: messages_1.ProgressTitles.create,
             progressSteps: 1,
             componentName: constant_1.componentName,
             errorSource: constant_1.errorSource,
@@ -107,7 +110,7 @@ tslib_1.__decorate([
     lib_1.hooks([
         actionExecutionMW_1.ActionExecutionMW({
             enableProgressBar: true,
-            progressTitle: messages_1.ProgressTitles.generateSample,
+            progressTitle: messages_1.ProgressTitles.create,
             progressSteps: 1,
             componentName: constant_1.componentName,
             errorSource: constant_1.errorSource,
@@ -120,29 +123,30 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], Generator, "generateSample", null);
 exports.Generator = Generator;
-async function templateDefaultOnActionError(action, context, error) {
+function templateDefaultOnActionError(action, context, error) {
     switch (action.name) {
         case generatorAction_1.GeneratorActionName.FetchTemplateUrlWithTag:
         case generatorAction_1.GeneratorActionName.FetchZipFromUrl:
             context.cancelDownloading = true;
             if (!(error instanceof error_1.CancelDownloading)) {
-                await context.logProvider.info(error.message);
-                await context.logProvider.info(messages_1.LogMessages.getTemplateFromLocal);
+                context.logProvider.info(error.message);
+                context.logProvider.info(messages_1.LogMessages.getTemplateFromLocal);
             }
             break;
         case generatorAction_1.GeneratorActionName.FetchTemplateZipFromLocal:
-            await context.logProvider.error(error.message);
-            throw new error_1.TemplateZipFallbackError().toFxError();
+            context.logProvider.error(error.message);
+            return Promise.reject(new error_1.TemplateZipFallbackError().toFxError());
         case generatorAction_1.GeneratorActionName.Unzip:
-            await context.logProvider.error(error.message);
-            throw new error_1.UnzipError().toFxError();
+            context.logProvider.error(error.message);
+            return Promise.reject(new error_1.UnzipError().toFxError());
         default:
-            throw new Error(error.message);
+            return Promise.reject(new Error(error.message));
     }
+    return Promise.resolve();
 }
 exports.templateDefaultOnActionError = templateDefaultOnActionError;
 async function sampleDefaultOnActionError(action, context, error) {
-    await context.logProvider.error(error.message);
+    context.logProvider.error(error.message);
     switch (action.name) {
         case generatorAction_1.GeneratorActionName.DownloadDirectory:
             if (await fs_extra_1.default.pathExists(context.destination)) {
@@ -157,7 +161,7 @@ async function sampleDefaultOnActionError(action, context, error) {
                 throw new error_1.DownloadSampleNetworkError(context.url).toFxError();
             }
         case generatorAction_1.GeneratorActionName.FetchZipFromUrl:
-            throw new error_1.FetchZipFromUrlError(context.url).toFxError();
+            throw new error_1.FetchZipFromUrlError(context.url, error).toFxError();
         case generatorAction_1.GeneratorActionName.Unzip:
             throw new error_1.UnzipError().toFxError();
         default:

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

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

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;AAO7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,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,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,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,eA0BlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAQrC,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAS3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAYnC,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,eAc7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAczB,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;AAO7B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,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,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,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,eA2BlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,eAQrC,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,eAS3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,eAYnC,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,eAc7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,eAczB,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"}

package/build/component/generator/generatorAction.js

@@ -23,20 +23,21 @@ var GeneratorActionName;
 // * This action is only for debug purpose
 exports.fetchTemplateZipFromSourceCodeAction = {
     name: GeneratorActionName.FetchTemplateZipFromSourceCode,
-    run: async (context) => {
+    run: (context) => {
         const isDebugMode = () => {
             const DebugTemplateFlag = process.env[constants_1.FeatureFlagName.DebugTemplate];
             return (DebugTemplateFlag === null || DebugTemplateFlag === void 0 ? void 0 : DebugTemplateFlag.toLowerCase()) === "true" && process.env.NODE_ENV === "development";
         };
         if (!isDebugMode()) {
-            return;
+            return Promise.resolve();
         }
         if (context.zip) {
-            return;
+            return Promise.resolve();
         }
         //! This path only works in debug mode
         const templateSourceCodePath = path_1.default.resolve(__dirname, "../../../../../", "templates", context.name);
         context.zip = utils_1.zipFolder(templateSourceCodePath);
+        return Promise.resolve();
     },
 };
 exports.downloadDirectoryAction = {

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":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,8DAA6B;AAC7B,wDAAwB;AACxB,mCAAoG;AACpG,gEAA0B;AAC1B,yCAAkD;AAClD,mCAAuC;AACvC,sDAAyD;AAgCzD,IAAY,mBAOX;AAPD,WAAY,mBAAmB;IAC7B,8FAAuE,CAAA;IACvE,2EAAoD,CAAA;IACpD,0DAAmC,CAAA;IACnC,8EAAuD,CAAA;IACvD,8DAAuC,CAAA;IACvC,sCAAe,CAAA;AACjB,CAAC,EAPW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAO9B;AAED,0CAA0C;AAC7B,QAAA,oCAAoC,GAAoB;IACnE,IAAI,EAAE,mBAAmB,CAAC,8BAA8B;IACxD,GAAG,EAAE,CAAC,OAAyB,EAAE,EAAE;QACjC,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,aAAa,CAAC,CAAC;YACrE,OAAO,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,WAAW,EAAE,MAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;QAC/F,CAAC,CAAC;QAEF,IAAI,CAAC,WAAW,EAAE,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED,sCAAsC;QACtC,MAAM,sBAAsB,GAAG,cAAI,CAAC,OAAO,CACzC,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,OAAO,CAAC,IAAI,CACb,CAAC;QAEF,OAAO,CAAC,GAAG,GAAG,iBAAS,CAAC,sBAAsB,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC;AAEW,QAAA,uBAAuB,GAAoB;IACtD,IAAI,EAAE,mBAAmB,CAAC,iBAAiB;IAC3C,GAAG,EAAE,KAAK,EAAE,OAAyB,EAAE,EAAE;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,MAAM,IAAI,oBAAY,CAAC,KAAK,CAAC,CAAC;SAC/B;QACD,MAAM,yBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAC;AAEW,QAAA,6BAA6B,GAAoB;IAC5D,IAAI,EAAE,mBAAmB,CAAC,uBAAuB;IACjD,GAAG,EAAE,KAAK,EAAE,OAAyB,EAAE,EAAE;QACvC,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC3D,OAAO;SACR;QAED,OAAO,CAAC,GAAG,GAAG,MAAM,2BAAmB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAChG,CAAC;CACF,CAAC;AAEW,QAAA,qBAAqB,GAAoB;IACpD,IAAI,EAAE,mBAAmB,CAAC,eAAe;IACzC,GAAG,EAAE,KAAK,EAAE,OAAyB,EAAE,EAAE;QACvC,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC5C,OAAO;SACR;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,MAAM,IAAI,oBAAY,CAAC,KAAK,CAAC,CAAC;SAC/B;QACD,OAAO,CAAC,GAAG,GAAG,MAAM,uBAAe,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3F,CAAC;CACF,CAAC;AAEW,QAAA,+BAA+B,GAAoB;IAC9D,IAAI,EAAE,mBAAmB,CAAC,yBAAyB;IACnD,GAAG,EAAE,KAAK,EAAE,OAAyB,EAAE,EAAE;QACvC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,OAAO;SACR;QACD,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QACxB,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,UAAU,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;QACvC,MAAM,OAAO,GAAW,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAW,MAAM,kBAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,GAAG,IAAI,iBAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACF,CAAC;AAEW,QAAA,WAAW,GAAoB;IAC1C,IAAI,EAAE,mBAAmB,CAAC,KAAK;IAC/B,GAAG,EAAE,KAAK,EAAE,OAAyB,EAAE,EAAE;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,MAAM,IAAI,oBAAY,CAAC,KAAK,CAAC,CAAC;SAC/B;QACD,MAAM,aAAK,CACT,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,YAAY,CACrB,CAAC;IACJ,CAAC;CACF,CAAC;AAEW,QAAA,iBAAiB,GAAsB;IAClD,4CAAoC;IACpC,qCAA6B;IAC7B,6BAAqB;IACrB,uCAA+B;IAC/B,mBAAW;CACZ,CAAC;AAEW,QAAA,eAAe,GAAsB,CAAC,6BAAqB,EAAE,mBAAW,CAAC,CAAC;AAC1E,QAAA,0BAA0B,GAAsB,CAAC,+BAAuB,CAAC,CAAC"}

package/build/component/generator/officeAddin/config/projectProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectProperties.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoC7B,CAAC"}
+{"version":3,"file":"projectProperties.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoC7B,CAAC"}

package/build/component/generator/officeAddin/config/projectProperties.js

@@ -1,4 +1,6 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectProperties = void 0;
 exports.projectProperties = {

package/build/component/generator/officeAddin/config/projectProperties.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectProperties.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,WAAW,EAAE,6BAA6B;YAC1C,MAAM,EAAE,8BAA8B;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,oDAAoD;oBAChE,MAAM,EAAE,wBAAwB;oBAChC,UAAU,EAAE,mCAAmC;iBAChD;aACF;YACD,cAAc,EAAE,CAAC,SAAS,CAAC;SAC5B;KACF;IACD,SAAS,EAAE;QACT,KAAK,EAAE;YACL,WAAW,EAAE,OAAO;SACrB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,UAAU,EAAE;YACV,WAAW,EAAE,YAAY;SAC1B;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM;SACpB;KACF;CACF,CAAC"}
+{"version":3,"file":"projectProperties.js","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectProperties.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,iBAAiB,GAAG;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE;YACR,WAAW,EAAE,6BAA6B;YAC1C,MAAM,EAAE,8BAA8B;YACtC,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,oDAAoD;oBAChE,MAAM,EAAE,wBAAwB;oBAChC,UAAU,EAAE,mCAAmC;iBAChD;aACF;YACD,cAAc,EAAE,CAAC,SAAS,CAAC;SAC5B;KACF;IACD,SAAS,EAAE;QACT,KAAK,EAAE;YACL,WAAW,EAAE,OAAO;SACrB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,UAAU,EAAE;YACV,WAAW,EAAE,YAAY;SAC1B;QACD,OAAO,EAAE;YACP,WAAW,EAAE,SAAS;SACvB;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM;SACpB;KACF;CACF,CAAC"}

package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectsJsonData.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEnC,eAAe,EAAE,GAAG,CAAC;;IAMrB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAIlD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAI9C,wBAAwB,IAAI,OAAO;IAInC,uBAAuB,IAAI,MAAM,EAAE;IAQnC,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAOpD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAYnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBtD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5F,4BAA4B,CAC1B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;IAiBrB,uBAAuB,CACrB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB;QAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;CAc5D"}
+{"version":3,"file":"projectsJsonData.d.ts","sourceRoot":"","sources":["../../../../../src/component/generator/officeAddin/config/projectsJsonData.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAEnC,eAAe,EAAE,GAAG,CAAC;;IAMrB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAIlD,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAI9C,wBAAwB,IAAI,OAAO;IAInC,uBAAuB,IAAI,MAAM,EAAE;IAQnC,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAOpD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIxD,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAYnD,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBtD,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASvD,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAa5F,4BAA4B,CAC1B,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,SAAS;IAiBrB,uBAAuB,CACrB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,OAAO,GAClB;QAAE,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;CAc5D"}

package/build/component/generator/officeAddin/config/projectsJsonData.js

@@ -1,4 +1,6 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));

package/build/component/generator/officeAddin/config/projectsJsonData.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,OAAO,EACR,MAAM,wBAAwB,CAAC;AA0BhC,qBAAa,oBAAoB;WASlB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAoBlB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;;WAIhC,aAAa,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAyDvC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,MAAM,EAKN,OAAO,EACR,MAAM,wBAAwB,CAAC;AAqBhC,qBAAa,oBAAoB;WASlB,QAAQ,CACnB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAoBlB,gBAAgB,CAAC,OAAO,EAAE,MAAM;;;;WAIhC,aAAa,CAC/B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAyEvC"}

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

@@ -9,7 +9,6 @@ const tslib_1 = require("tslib");
  */
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const path_1 = require("path");
-const question_1 = require("./question");
 const helperMethods_1 = require("./helperMethods");
 const office_addin_manifest_1 = require("office-addin-manifest");
 const projectsJsonData_1 = tslib_1.__importDefault(require("./config/projectsJsonData"));
@@ -22,6 +21,8 @@ const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
 const generator_1 = require("../generator");
 const office_addin_project_1 = require("office-addin-project");
 const questionNames_1 = require("../../../question/questionNames");
+const create_1 = require("../../../question/create");
+const localizeUtils_1 = require("../../../common/localizeUtils");
 const componentName = "office-addin";
 const telemetryEvent = "generate";
 const templateName = "office-addin";
@@ -32,7 +33,7 @@ class OfficeAddinGenerator {
             return teamsfx_api_1.err(result.error);
         }
         // If lang is undefined, it means the project is created from a folder.
-        const lang = inputs[question_1.AddinLanguageQuestion.name];
+        const lang = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
         const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, templateName, lang ? (lang === "TypeScript" ? "ts" : "js") : undefined);
         if (templateRes.isErr())
             return teamsfx_api_1.err(templateRes.error);
@@ -42,13 +43,14 @@ class OfficeAddinGenerator {
         return util_1.promisify(childProcess.exec)(cmdLine);
     }
     static async doScaffolding(context, inputs, destinationPath) {
-        const template = question_1.getTemplate(inputs);
+        const template = create_1.getTemplate(inputs);
         const name = inputs[questionNames_1.QuestionNames.AppName];
         const addinRoot = destinationPath;
-        const fromFolder = inputs[question_1.AddinProjectFolderQuestion.name];
-        const language = inputs[question_1.AddinLanguageQuestion.name];
-        const host = inputs[question_1.OfficeHostQuestion.name];
+        const fromFolder = inputs[questionNames_1.QuestionNames.OfficeAddinFolder];
+        const language = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
+        const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
         const workingDir = process.cwd();
+        const importProgress = context.userInteraction.createProgressBar(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.title"), 3);
         process.chdir(addinRoot);
         try {
             if (!fromFolder) {
@@ -68,23 +70,29 @@ class OfficeAddinGenerator {
                 }
             }
             else {
+                await importProgress.start();
                 // from existing project
+                await importProgress.next(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.copyFiles"));
                 helperMethods_1.HelperMethods.copyAddinFiles(fromFolder, addinRoot);
-                const sourceManifestFile = inputs[question_1.AddinProjectManifestQuestion.name];
+                const sourceManifestFile = inputs[questionNames_1.QuestionNames.OfficeAddinManifest];
                 let manifestFile = sourceManifestFile.replace(fromFolder, addinRoot);
+                await importProgress.next(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.convertProject"));
                 if (manifestFile.endsWith(".xml")) {
                     // Need to convert to json project first
                     await office_addin_project_1.convertProject(manifestFile);
                     manifestFile = manifestFile.replace(/\.xml$/, ".json");
                 }
-                inputs[question_1.OfficeHostQuestion.name] = await getHost(manifestFile);
-                helperMethods_1.HelperMethods.updateManifest(destinationPath, manifestFile);
+                inputs[questionNames_1.QuestionNames.OfficeAddinHost] = await getHost(manifestFile);
+                await importProgress.next(localizeUtils_1.getLocalizedString("core.generator.officeAddin.importProject.updateManifest"));
+                await helperMethods_1.HelperMethods.updateManifest(destinationPath, manifestFile);
             }
             process.chdir(workingDir);
+            await importProgress.end(true, true);
             return teamsfx_api_1.ok(undefined);
         }
         catch (e) {
             process.chdir(workingDir);
+            await importProgress.end(false, true);
             return teamsfx_api_1.err(error_1.CopyFileError(e));
         }
     }

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

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

package/build/component/generator/officeAddin/helperMethods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAaA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;WA0BH,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvE,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAoBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAqB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB"}
+{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAgBA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;WA4BH,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBvE,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAoBrD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAqB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB"}

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

@@ -1,4 +1,6 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HelperMethods = void 0;
 const tslib_1 = require("tslib");
@@ -15,7 +17,7 @@ const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const zipFile = "project.zip";
 class HelperMethods {
     static async downloadProjectTemplateZipFile(projectFolder, projectRepo, projectBranch) {
-        const projectTemplateZipFile = `${projectRepo}/archive/${projectBranch}.zip`;
+        const projectTemplateZipFile = `${projectRepo}/archive/${projectBranch || ""}.zip`;
         return axios_1.default
             .get(projectTemplateZipFile, {
             responseType: "stream",
@@ -25,7 +27,9 @@ class HelperMethods {
                 response.data
                     .pipe(fs_1.default.createWriteStream(`${projectFolder}/${zipFile}`))
                     .on("error", function (err) {
-                    reject(`Unable to download project zip file for "${projectTemplateZipFile}".\n${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);
@@ -34,19 +38,21 @@ class HelperMethods {
             });
         })
             .catch((err) => {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             console.log(`Unable to download project zip file for "${projectTemplateZipFile}".\n${err}`);
         });
     }
     static async unzipProjectTemplate(projectFolder) {
-        return new Promise(async (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             // TODO: Verify file exists
             const readStream = fs_1.default.createReadStream(`${projectFolder}/${zipFile}`);
             readStream
                 .pipe(unzip.Extract({ path: projectFolder }))
                 .on("error", function (err) {
+                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                 reject(`Unable to unzip project zip file for "${projectFolder}".\n${err}`);
             })
-                .on("close", async () => {
+                .on("close", () => {
                 HelperMethods.moveUnzippedFiles(projectFolder);
                 resolve();
             });
@@ -77,7 +83,7 @@ class HelperMethods {
         // Read add-in manifest file
         const addinManifest = await teamsfx_api_1.ManifestUtil.loadFromPath(addinManifestPath);
         // Open project manifest file
-        const manifestTemplatePath = await ManifestUtils_1.manifestUtils.getTeamsAppManifestPath(projectRoot);
+        const manifestTemplatePath = ManifestUtils_1.manifestUtils.getTeamsAppManifestPath(projectRoot);
         const manifest = await teamsfx_api_1.ManifestUtil.loadFromPath(manifestTemplatePath);
         // Update project manifest
         manifest.extensions = addinManifest.extensions;

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/generatorChecker.d.ts

@@ -4,7 +4,7 @@ export declare class GeneratorChecker implements DependencyChecker {
     private readonly _logger;
     constructor(logger: LogProvider);
     ensureLatestDependency(ctx: Context): Promise<Result<boolean, FxError>>;
-    isLatestInstalled(): Promise<boolean>;
+    isLatestInstalled(loadedLatestVersion: string | undefined): Promise<boolean>;
     install(): Promise<void>;
     getSpGeneratorPath(): string;
     findGloballyInstalledVersion(timeoutInSeconds?: number): Promise<string | undefined>;

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;AAaxD,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;IA2BvE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAarC,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;YAiBP,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,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"}

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

@@ -14,7 +14,6 @@ const error_1 = require("../error");
 const cpUtils_1 = require("../../../../common/deps-checker/util/cpUtils");
 const constants_1 = require("../utils/constants");
 const utils_1 = require("../utils/utils");
-const create_1 = require("../../../../question/create");
 const name = constants_1.Constants.GeneratorPackageName;
 const displayName = `${name}@${constants_1.Constants.LatestVersion}`;
 const timeout = 6 * 60 * 1000;
@@ -25,25 +24,25 @@ class GeneratorChecker {
     async ensureLatestDependency(ctx) {
         telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGeneratorStart);
         try {
-            this._logger.info(`${displayName} not found, installing...`);
+            void this._logger.info(`${displayName} not found, installing...`);
             await this.install();
-            this._logger.info(`Successfully installed ${displayName}`);
+            void this._logger.info(`Successfully installed ${displayName}`);
             telemetry_helper_1.telemetryHelper.sendSuccessEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGenerator);
         }
         catch (error) {
             telemetry_helper_1.telemetryHelper.sendErrorEvent(ctx, telemetryEvents_1.TelemetryEvents.EnsureLatestSharepointGenerator, error, {
                 [telemetryEvents_1.TelemetryProperty.EnsureLatestSharepointGeneratorReason]: error.name,
             });
-            await this._logger.error(`Failed to install ${displayName}, error = '${error}'`);
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            this._logger.error(`Failed to install ${displayName}, error = '${error}'`);
             return teamsfx_api_1.err(error);
         }
         return teamsfx_api_1.ok(true);
     }
-    async isLatestInstalled() {
-        var _a;
+    async isLatestInstalled(loadedLatestVersion) {
         try {
             const generatorVersion = await this.queryVersion();
-            const latestGeneratorVersion = (_a = create_1.PackageSelectOptionsHelper.getLatestSpGeneratorVersion()) !== null && _a !== void 0 ? _a : (await this.findLatestVersion(5));
+            const latestGeneratorVersion = loadedLatestVersion !== null && loadedLatestVersion !== void 0 ? loadedLatestVersion : (await this.findLatestVersion(5));
             const hasSentinel = await fs.pathExists(this.getSentinelPath());
             return !!latestGeneratorVersion && generatorVersion === latestGeneratorVersion && hasSentinel;
         }
@@ -52,12 +51,12 @@ class GeneratorChecker {
         }
     }
     async install() {
-        this._logger.info("Start installing...");
+        void this._logger.info("Start installing...");
         await this.cleanup();
         await this.installGenerator();
-        this._logger.info("Validating package...");
+        void this._logger.info("Validating package...");
         if (!(await this.validate())) {
-            this._logger.debug(`Failed to validate ${name}, cleaning up...`);
+            void this._logger.debug(`Failed to validate ${name}, cleaning up...`);
             await this.cleanup();
             throw error_1.DependencyValidateError(name);
         }
@@ -100,7 +99,8 @@ class GeneratorChecker {
             await fs.remove(this.getSentinelPath());
         }
         catch (err) {
-            await this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err}`);
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            this._logger.error(`Failed to clean up path: ${this.getDefaultInstallPath()}, error: ${err}`);
         }
     }
     async installGenerator() {
@@ -111,7 +111,7 @@ class GeneratorChecker {
             await fs.ensureFile(this.getSentinelPath());
         }
         catch (error) {
-            this._logger.error(`Failed to execute npm install ${displayName}`);
+            void this._logger.error(`Failed to execute npm install ${displayName}`);
             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":"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"}

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

@@ -6,7 +6,7 @@ export declare class YoChecker implements DependencyChecker {
     ensureLatestDependency(ctx: Context): Promise<Result<boolean, FxError>>;
     isLatestInstalled(): Promise<boolean>;
     install(): Promise<void>;
-    getBinFolders(): Promise<string[]>;
+    getBinFolders(): string[];
     findGloballyInstalledVersion(timeoutInSeconds?: number): Promise<string | undefined>;
     findLatestVersion(timeoutInSeconds: number): Promise<string | undefined>;
     private validate;

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;IAwBvE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAWrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAaxB,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKlC,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;YAkCP,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,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"}