@microsoft/teamsfx-core 1.23.3 → 2.0.0-alpha.14ea2b310.0

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

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/question.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,UAAU,EACV,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAQhC,eAAO,MAAM,gBAAgB,EAAE,MAAM,UAAU,EAM1C,CAAC;AAGN,wBAAgB,sBAAsB,IAAI,UAAU,CAQnD;AAED,eAAO,MAAM,eAAe,EAAE,UAM7B,CAAC;AAEF,oBAAY,YAAY;IACtB,qBAAqB,mBAAmB;IACxC,iBAAiB,eAAe;IAChC,0BAA0B,yBAAyB;IACnD,4BAA4B,2BAA2B;IACvD,2BAA2B,0BAA0B;IACrD,kBAAkB,eAAe;CAClC;AAED,eAAO,MAAM,qBAAqB,EAAE,oBAiBnC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,oBAoBhC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,cAIxC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,kBAQ1C,CAAC;AAEF,eAAO,MAAM,WAAW,WAAY,MAAM,KAAG,MAS5C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,SA2C7C,CAAC"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/question.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,UAAU,EACV,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAQhC,eAAO,MAAM,gBAAgB,EAAE,MAAM,UAAU,EAM1C,CAAC;AAGN,wBAAgB,sBAAsB,IAAI,UAAU,CAQnD;AAED,oBAAY,YAAY;IACtB,qBAAqB,mBAAmB;IACxC,iBAAiB,eAAe;IAChC,0BAA0B,yBAAyB;IACnD,4BAA4B,2BAA2B;IACvD,2BAA2B,0BAA0B;IACrD,kBAAkB,eAAe;CAClC;AAED,eAAO,MAAM,qBAAqB,EAAE,oBAiBnC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,oBAoBhC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,cAIxC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,kBAQ1C,CAAC;AAEF,eAAO,MAAM,WAAW,WAAY,MAAM,KAAG,MAS5C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,SA2C7C,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQuestionsForScaffolding = exports.getTemplate = exports.AddinProjectManifestQuestion = exports.AddinProjectFolderQuestion = exports.OfficeHostQuestion = exports.AddinLanguageQuestion = exports.QuestionName = exports.OfficeAddinItem = exports.ImportAddinProjectItem = exports.OfficeAddinItems = void 0;
+exports.getQuestionsForScaffolding = exports.getTemplate = exports.AddinProjectManifestQuestion = exports.AddinProjectFolderQuestion = exports.OfficeHostQuestion = exports.AddinLanguageQuestion = exports.QuestionName = exports.ImportAddinProjectItem = exports.OfficeAddinItems = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -10,8 +10,8 @@ const projectsJsonData_1 = tslib_1.__importDefault(require("./config/projectsJso
 const jsonData = new projectsJsonData_1.default();
 const OfficeAddinItems = () => jsonData.getProjectTemplateNames().map((template) => ({
     id: template,
-    label: jsonData.getProjectDisplayName(template),
-    detail: jsonData.getProjectDetails(template),
+    label: localizeUtils_1.getLocalizedString(jsonData.getProjectDisplayName(template)),
+    detail: localizeUtils_1.getLocalizedString(jsonData.getProjectDetails(template)),
     groupName: localizeUtils_1.getLocalizedString("core.options.separator.addin"),
 }));
 exports.OfficeAddinItems = OfficeAddinItems;
@@ -19,20 +19,13 @@ exports.OfficeAddinItems = OfficeAddinItems;
 function ImportAddinProjectItem() {
     return {
         id: "import-addin-project",
-        label: "Import Add-in",
+        label: localizeUtils_1.getLocalizedString("core.importAddin.label"),
         cliName: "import",
-        detail: "Import an office independent add-in project",
+        detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
         groupName: localizeUtils_1.getLocalizedString("core.options.separator.addin"),
     };
 }
 exports.ImportAddinProjectItem = ImportAddinProjectItem;
-exports.OfficeAddinItem = {
-    id: "office-addin",
-    label: "office addin label",
-    cliName: "tab",
-    description: "Office Addin description",
-    detail: "Office Addin detail",
-};
 var QuestionName;
 (function (QuestionName) {
     QuestionName["AddinLanguageQuestion"] = "addin-language";

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

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

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

@@ -1,6 +1,6 @@
 import { ContextV3, FxError, Inputs, Result } from "@microsoft/teamsfx-api";
 export declare class SPFxGenerator {
     static generate(context: ContextV3, inputs: Inputs, destinationPath: string): Promise<Result<undefined, FxError>>;
-    private static doYeomanScaffold;
+    static doYeomanScaffold(context: ContextV3, inputs: Inputs, destinationPath: string): Promise<Result<string, FxError>>;
 }
 //# sourceMappingURL=spfxGenerator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../src/component/generator/spfxGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAO,OAAO,EAAE,MAAM,EAAgB,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAmB/F,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;mBAejB,gBAAgB;CA6KtC"}
+{"version":3,"file":"spfxGenerator.d.ts","sourceRoot":"","sources":["../../../src/component/generator/spfxGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,OAAO,EACP,MAAM,EAGN,MAAM,EAEP,MAAM,wBAAwB,CAAC;AA2BhC,qBAAa,aAAa;WASJ,QAAQ,CAC1B,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;WAelB,gBAAgB,CAClC,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CA8KpC"}

package/build/component/generator/spfxGenerator.js

@@ -17,12 +17,13 @@ const lodash_1 = require("lodash");
 const constants_1 = require("../resource/spfx/utils/constants");
 const yoChecker_1 = require("../resource/spfx/depsChecker/yoChecker");
 const generatorChecker_1 = require("../resource/spfx/depsChecker/generatorChecker");
-const tools_1 = require("../../common/tools");
 const deps_checker_1 = require("../../common/deps-checker");
 const telemetryEvents_1 = require("../resource/spfx/utils/telemetryEvents");
 const generator_1 = require("./generator");
 const question_1 = require("../../core/question");
 const localizeUtils_1 = require("../../common/localizeUtils");
+const question_helper_1 = require("../resource/spfx/utils/question-helper");
+const constants_2 = require("../constants");
 class SPFxGenerator {
     static async generate(context, inputs, destinationPath) {
         const yeomanRes = await this.doYeomanScaffold(context, inputs, destinationPath);
@@ -34,54 +35,65 @@ class SPFxGenerator {
         return teamsfx_api_1.ok(undefined);
     }
     static async doYeomanScaffold(context, inputs, destinationPath) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         const ui = context.userInteraction;
-        const progressHandler = await progress_helper_1.ProgressHelper.startScaffoldProgressHandler(ui);
+        const progressHandler = await progress_helper_1.ProgressHelper.startScaffoldProgressHandler(ui, inputs.stage == teamsfx_api_1.Stage.addWebpart);
+        const shouldInstallLocally = inputs[questions_1.SPFXQuestionNames.use_global_package_or_install_local] ===
+            question_helper_1.SPFxVersionOptionIds.installLocally;
         try {
             const webpartName = inputs[questions_1.SPFXQuestionNames.webpart_name];
             const framework = inputs[questions_1.SPFXQuestionNames.framework_type];
             const solutionName = inputs[question_1.CoreQuestionNames.AppName];
+            const isAddSPFx = inputs.stage == teamsfx_api_1.Stage.addWebpart;
             const componentName = utils_1.Utils.normalizeComponentName(webpartName);
             const componentNameCamelCase = lodash_1.camelCase(componentName);
             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);
-            const yoInstalled = await yoChecker.isInstalled();
-            const generatorInstalled = await spGeneratorChecker.isInstalled();
-            if (!yoInstalled || !generatorInstalled) {
-                await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.dependencyInstall")));
-                if (tools_1.isYoCheckerEnabled()) {
-                    const yoRes = await yoChecker.ensureDependency(context);
-                    if (yoRes.isErr()) {
-                        throw error_1.DependencyInstallError("yo");
+            if (shouldInstallLocally) {
+                const latestYoInstalled = await yoChecker.isLatestInstalled();
+                const latestGeneratorInstalled = await spGeneratorChecker.isLatestInstalled();
+                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_1.LatestPackageInstallError();
+                        }
                     }
-                }
-                if (tools_1.isGeneratorCheckerEnabled()) {
-                    const spGeneratorRes = await spGeneratorChecker.ensureDependency(context);
-                    if (spGeneratorRes.isErr()) {
-                        throw error_1.DependencyInstallError("sharepoint generator");
+                    if (!latestGeneratorInstalled) {
+                        const spGeneratorRes = await spGeneratorChecker.ensureLatestDependency(context);
+                        if (spGeneratorRes.isErr()) {
+                            throw error_1.LatestPackageInstallError();
+                        }
                     }
                 }
             }
-            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.scaffoldProject")));
+            else {
+                const isLowerVersion = question_helper_1.PackageSelectOptionsHelper.isLowerThanRecommendedVersion();
+                if (isLowerVersion) {
+                    context.telemetryReporter.sendTelemetryEvent(telemetryEvents_1.TelemetryEvents.UseNotRecommendedVersion);
+                }
+            }
+            await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString(isAddSPFx
+                ? "driver.spfx.add.progress.scaffoldWebpart"
+                : "plugins.spfx.scaffold.scaffoldProject")));
             if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
                 context.logProvider.outputChannel.show();
             }
             const yoEnv = process.env;
             if (yoEnv.PATH) {
-                yoEnv.PATH = tools_1.isYoCheckerEnabled()
+                yoEnv.PATH = shouldInstallLocally
                     ? `${await (await yoChecker.getBinFolders()).join(path.delimiter)}${path.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`
                     : process.env.PATH;
             }
             else {
-                yoEnv.Path = tools_1.isYoCheckerEnabled()
+                yoEnv.Path = shouldInstallLocally
                     ? `${await (await yoChecker.getBinFolders()).join(path.delimiter)}${path.delimiter}${(_b = process.env.Path) !== null && _b !== void 0 ? _b : ""}`
                     : process.env.Path;
             }
             const args = [
-                tools_1.isGeneratorCheckerEnabled()
-                    ? spGeneratorChecker.getSpGeneratorPath()
-                    : "@microsoft/sharepoint",
+                shouldInstallLocally ? spGeneratorChecker.getSpGeneratorPath() : "@microsoft/sharepoint",
                 "--skip-install",
                 "true",
                 "--component-type",
@@ -101,13 +113,23 @@ class SPFxGenerator {
             if (solutionName) {
                 args.push("--solution-name", solutionName);
             }
-            await deps_checker_1.cpUtils.executeCommand(destinationPath, context.logProvider, {
-                timeout: 2 * 60 * 1000,
-                env: yoEnv,
-            }, "yo", ...args);
+            try {
+                await deps_checker_1.cpUtils.executeCommand(isAddSPFx ? inputs[constants_2.SPFxQuestionNames.SPFxFolder] : destinationPath, context.logProvider, {
+                    timeout: 2 * 60 * 1000,
+                    env: yoEnv,
+                }, "yo", ...args);
+            }
+            catch (yoError) {
+                if (yoError.message) {
+                    context.logProvider.error(yoError.message);
+                }
+                throw error_1.YoGeneratorScaffoldError();
+            }
             const newPath = path.join(destinationPath, "src");
-            const currentPath = path.join(destinationPath, solutionName);
-            await fs_extra_1.default.rename(currentPath, newPath);
+            if (!isAddSPFx) {
+                const currentPath = path.join(destinationPath, solutionName);
+                await fs_extra_1.default.rename(currentPath, newPath);
+            }
             await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.next(localizeUtils_1.getLocalizedString("plugins.spfx.scaffold.updateManifest")));
             const manifestPath = `${newPath}/src/webparts/${componentNameCamelCase}/${componentName}WebPart.manifest.json`;
             const manifest = await fs_extra_1.default.readFile(manifestPath, "utf8");
@@ -117,11 +139,13 @@ class SPFxGenerator {
             const matchHashComment = new RegExp(/(\/\/ .*)/, "gi");
             const manifestJson = JSON.parse(manifestString.replace(matchHashComment, "").trim());
             const componentId = manifestJson.id;
-            if (!context.templateVariables) {
-                context.templateVariables = generator_1.Generator.getDefaultVariables(solutionName);
+            if (!isAddSPFx) {
+                if (!context.templateVariables) {
+                    context.templateVariables = generator_1.Generator.getDefaultVariables(solutionName);
+                }
+                context.templateVariables["componentId"] = componentId;
+                context.templateVariables["webpartName"] = webpartName;
             }
-            context.templateVariables["componentId"] = componentId;
-            context.templateVariables["webpartName"] = webpartName;
             // remove dataVersion() function, related issue: https://github.com/SharePoint/sp-dev-docs/issues/6469
             const webpartFile = `${newPath}/src/webparts/${componentNameCamelCase}/${componentName}WebPart.ts`;
             const codeFile = await fs_extra_1.default.readFile(webpartFile, "utf8");
@@ -135,27 +159,9 @@ class SPFxGenerator {
                 await fs_extra_1.default.remove(debugPath);
             }
             await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(true));
-            return teamsfx_api_1.ok(undefined);
+            return teamsfx_api_1.ok(componentId);
         }
         catch (error) {
-            if (error.name === "DependencyInstallFailed") {
-                const globalYoVersion = utils_1.Utils.getPackageVersion("yo");
-                const globalGenVersion = utils_1.Utils.getPackageVersion("@microsoft/generator-sharepoint");
-                const yoInfo = yoChecker_1.YoChecker.getDependencyInfo();
-                const genInfo = generatorChecker_1.GeneratorChecker.getDependencyInfo();
-                const yoMessage = globalYoVersion === undefined
-                    ? "    yo not installed"
-                    : `    globally installed yo@${globalYoVersion}`;
-                const generatorMessage = globalGenVersion === undefined
-                    ? "    @microsoft/generator-sharepoint not installed"
-                    : `    globally installed @microsoft/generator-sharepoint@${globalYoVersion}`;
-                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error(`We've encountered some issues when trying to install prerequisites under HOME/.fx folder.  Learn how to remediate by going to this link(aka.ms/teamsfx-spfx-help) and following the steps applicable to your system: \n ${yoMessage} \n ${generatorMessage}`);
-                (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error(`Teams Toolkit recommends using ${yoInfo.displayName} ${genInfo.displayName}`);
-            }
-            if (error.message &&
-                error.message.includes("'yo' is not recognized as an internal or external command")) {
-                (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error("NPM v6.x with Node.js v12.13.0+ (Erbium) or Node.js v14.15.0+ (Fermium) is recommended for spfx scaffolding and later development. You can use correct version and try again.");
-            }
             await (progressHandler === null || progressHandler === void 0 ? void 0 : progressHandler.end(false));
             return teamsfx_api_1.err(error_1.ScaffoldError(error));
         }

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

@@ -1 +1 @@
-{"version":3,"file":"spfxGenerator.js","sourceRoot":"","sources":["../../../src/component/generator/spfxGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spfxGenerator.js","sourceRoot":"","sources":["../../../src/component/generator/spfxGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDASgC;AAChC,mDAA6B;AAC7B,gEAA0B;AAC1B,uEAAoE;AACpE,4EAAwE;AACxE,gEAAqE;AACrE,kDAIgC;AAChC,wDAAqD;AACrD,mCAAmC;AACnC,gEAAsF;AACtF,sEAAmE;AACnE,oFAAiF;AACjF,4DAAoD;AACpD,4EAAyE;AACzE,2CAAwC;AACxC,kDAAwD;AACxD,8DAAgE;AAChE,4EAGgD;AAChD,4CAAiD;AAEjD,MAAa,aAAa;IASjB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAC1B,OAAkB,EAClB,MAAc,EACd,eAAuB;QAEvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QAChF,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,MAAM,qBAAS,CAAC,gBAAgB,CAClD,OAAO,EACP,eAAe,EACf,qBAAS,CAAC,aAAa,EACvB,IAAI,CACL,CAAC;QACF,IAAI,WAAW,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEvD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAClC,OAAkB,EAClB,MAAc,EACd,eAAuB;;QAEvB,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;QACnC,MAAM,eAAe,GAAG,MAAM,gCAAc,CAAC,4BAA4B,CACvE,EAAE,EACF,MAAM,CAAC,KAAK,IAAI,mBAAK,CAAC,UAAU,CACjC,CAAC;QACF,MAAM,oBAAoB,GACxB,MAAM,CAAC,6BAAiB,CAAC,mCAAmC,CAAC;YAC7D,sCAAoB,CAAC,cAAc,CAAC;QACtC,IAAI;YACF,MAAM,WAAW,GAAG,MAAM,CAAC,6BAAiB,CAAC,YAAY,CAAW,CAAC;YACrE,MAAM,SAAS,GAAG,MAAM,CAAC,6BAAiB,CAAC,cAAc,CAAW,CAAC;YACrE,MAAM,YAAY,GAAG,MAAM,CAAC,4BAAiB,CAAC,OAAO,CAAW,CAAC;YACjE,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,IAAI,mBAAK,CAAC,UAAU,CAAC;YAEnD,MAAM,aAAa,GAAG,aAAK,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAChE,MAAM,sBAAsB,GAAG,kBAAS,CAAC,aAAa,CAAC,CAAC;YAExD,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,kCAAkB,CAAC,uCAAuC,CAAC,CAAC,CAAA,CAAC;YAEzF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;YACtD,MAAM,kBAAkB,GAAG,IAAI,mCAAgB,CAAC,OAAO,CAAC,WAAY,CAAC,CAAC;YAEtE,IAAI,oBAAoB,EAAE;gBACxB,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,iBAAiB,EAAE,CAAC;gBAC9D,MAAM,wBAAwB,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;gBAE9E,IAAI,CAAC,iBAAiB,IAAI,CAAC,wBAAwB,EAAE;oBACnD,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CACzB,kCAAkB,CAAC,yCAAyC,CAAC,CAC9D,CAAA,CAAC;oBAEF,IAAI,CAAC,iBAAiB,EAAE;wBACtB,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;wBAC9D,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE;4BACjB,MAAM,iCAAyB,EAAE,CAAC;yBACnC;qBACF;oBAED,IAAI,CAAC,wBAAwB,EAAE;wBAC7B,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;wBAChF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;4BAC1B,MAAM,iCAAyB,EAAE,CAAC;yBACnC;qBACF;iBACF;aACF;iBAAM;gBACL,MAAM,cAAc,GAAG,4CAA0B,CAAC,6BAA6B,EAAE,CAAC;gBAClF,IAAI,cAAc,EAAE;oBAClB,OAAO,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,iCAAe,CAAC,wBAAwB,CAAC,CAAC;iBACxF;aACF;YAED,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CACzB,kCAAkB,CAChB,SAAS;gBACP,CAAC,CAAC,0CAA0C;gBAC5C,CAAC,CAAC,uCAAuC,CAC5C,CACF,CAAA,CAAC;YACF,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;gBACtC,OAAO,CAAC,WAAmB,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;aACnD;YAED,MAAM,KAAK,GAAsB,OAAO,CAAC,GAAG,CAAC;YAC7C,IAAI,KAAK,CAAC,IAAI,EAAE;gBACd,KAAK,CAAC,IAAI,GAAG,oBAAoB;oBAC/B,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,GAC9E,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EACtB,EAAE;oBACJ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;aACtB;iBAAM;gBACL,KAAK,CAAC,IAAI,GAAG,oBAAoB;oBAC/B,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,GAC9E,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EACtB,EAAE;oBACJ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;aACtB;YAED,MAAM,IAAI,GAAG;gBACX,oBAAoB,CAAC,CAAC,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,uBAAuB;gBACxF,gBAAgB;gBAChB,MAAM;gBACN,kBAAkB;gBAClB,SAAS;gBACT,kBAAkB;gBAClB,WAAW;gBACX,eAAe;gBACf,KAAK;gBACL,2BAA2B;gBAC3B,MAAM;gBACN,sBAAsB;gBACtB,OAAO;aACR,CAAC;YACF,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;aACrC;YACD,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;aAC5C;YAED,IAAI;gBACF,MAAM,sBAAO,CAAC,cAAc,CAC1B,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,6BAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,EAClE,OAAO,CAAC,WAAW,EACnB;oBACE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;oBACtB,GAAG,EAAE,KAAK;iBACX,EACD,IAAI,EACJ,GAAG,IAAI,CACR,CAAC;aACH;YAAC,OAAO,OAAO,EAAE;gBAChB,IAAK,OAAe,CAAC,OAAO,EAAE;oBAC5B,OAAO,CAAC,WAAW,CAAC,KAAK,CAAE,OAAe,CAAC,OAAO,CAAC,CAAC;iBACrD;gBACD,MAAM,gCAAwB,EAAE,CAAC;aAClC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAClD,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,YAAa,CAAC,CAAC;gBAC9D,MAAM,kBAAE,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;aACvC;YAED,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,kCAAkB,CAAC,sCAAsC,CAAC,CAAC,CAAA,CAAC;YACxF,MAAM,YAAY,GAAG,GAAG,OAAO,iBAAiB,sBAAsB,IAAI,aAAa,uBAAuB,CAAC;YAC/G,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,cAAc,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACzC,cAAc,GAAG,cAAc,CAAC,OAAO,CACrC,yCAAyC,EACzC,yEAAyE,CAC1E,CAAC;YACF,MAAM,kBAAE,CAAC,SAAS,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEjD,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACrF,MAAM,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;YAEpC,IAAI,CAAC,SAAS,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;oBAC9B,OAAO,CAAC,iBAAiB,GAAG,qBAAS,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;iBACzE;gBACD,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,WAAW,CAAC;gBACvD,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,WAAW,CAAC;aACxD;YAED,sGAAsG;YACtG,MAAM,WAAW,GAAG,GAAG,OAAO,iBAAiB,sBAAsB,IAAI,aAAa,YAAY,CAAC;YACnG,MAAM,QAAQ,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACxD,IAAI,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACrC,UAAU,GAAG,UAAU,CAAC,OAAO,CAC7B,6FAA6F,EAC7F,EAAE,CACH,CAAC;YACF,UAAU,GAAG,UAAU,CAAC,OAAO,CAC7B,2DAA2D,EAC3D,EAAE,CACH,CAAC;YACF,MAAM,kBAAE,CAAC,SAAS,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAE5C,iBAAiB;YACjB,MAAM,SAAS,GAAG,GAAG,OAAO,UAAU,CAAC;YACvC,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAClC,MAAM,kBAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aAC5B;YAED,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,IAAI,CAAC,CAAA,CAAC;YACjC,OAAO,gBAAE,CAAC,WAAW,CAAC,CAAC;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC;YAClC,OAAO,iBAAG,CAAC,qBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;SAClC;IACH,CAAC;CACF;AArMC;IARC,WAAK,CAAC;QACL,qCAAiB,CAAC;YAChB,eAAe,EAAE,IAAI;YACrB,sBAAsB,EAAE,qBAAS,CAAC,eAAe;YACjD,kBAAkB,EAAE,iCAAe,CAAC,QAAQ;YAC5C,WAAW,EAAE,qBAAS,CAAC,eAAe;SACvC,CAAC;KACH,CAAC;;;;mCAkBD;AA1BH,sCA8MC"}

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

@@ -1,14 +1,16 @@
 /// <reference types="node" />
 import { SampleInfo } from "../../common/samples";
 import AdmZip from "adm-zip";
-export declare const templateVersion: () => string;
-export declare function fetchTagList(url: string, tryLimits: number, timeoutInMs: number): Promise<string>;
+import { AxiosResponse, CancelToken } from "axios";
+export declare function sendRequestWithRetry<T>(requestFn: () => Promise<AxiosResponse<T>>, tryLimits: number): Promise<AxiosResponse<T>>;
+export declare function sendRequestWithTimeout<T>(requestFn: (cancelToken: CancelToken) => Promise<AxiosResponse<T>>, timeoutInMs: number, tryLimits?: number): Promise<AxiosResponse<T>>;
 export declare function fetchTemplateZipUrl(name: string, tryLimits?: number, timeoutInMs?: number): Promise<string>;
 export declare function fetchZipFromUrl(url: string, tryLimits?: number, timeoutInMs?: number): Promise<AdmZip>;
-export declare function unzip(zip: AdmZip, dstPath: string, nameReplaceFn?: (filePath: string, data: Buffer) => string, dataReplaceFn?: (filePath: string, data: Buffer) => Buffer | string, relativePath?: string, filesInAppendMode?: string[]): Promise<void>;
+export declare function unzip(zip: AdmZip, dstPath: string, nameReplaceFn?: (filePath: string, data: Buffer) => string, dataReplaceFn?: (filePath: string, data: Buffer) => Buffer | string, relativePath?: string): Promise<void>;
 export declare function renderTemplateFileData(fileName: string, fileData: Buffer, variables?: {
     [key: string]: string;
 }): string | Buffer;
+export declare function escapeEmptyVariable(template: string, view: Record<string, string | undefined>, tags?: [string, string]): string[][];
 export declare function renderTemplateFileName(fileName: string, fileData: Buffer, variables?: {
     [key: string]: string;
 }): string;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAkB,MAAM,sBAAsB,CAAC;AAClE,OAAO,MAAM,MAAM,SAAS,CAAC;AAQ7B,eAAO,MAAM,eAAe,QAAO,MAAgC,CAAC;AAoEpE,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAcjB;AAGD,wBAAsB,KAAK,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,EAC1D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,EACnE,YAAY,CAAC,EAAE,MAAM,EACrB,iBAAiB,WAAiB,GACjC,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpC,MAAM,GAAG,MAAM,CAOjB;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpC,MAAM,CAKR;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAQpE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAIpD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,UAAU,EAAkB,MAAM,sBAAsB,CAAC;AAClE,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAyB1D,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwB3B;AAED,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,SAAS,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClE,WAAW,EAAE,MAAM,EACnB,SAAS,SAAI,GACZ,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAe3B;AAeD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAUjB;AAGD,wBAAsB,KAAK,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,EAC1D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,EACnE,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpC,MAAM,GAAG,MAAM,CAWjB;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACxC,IAAI,GAAE,CAAC,MAAM,EAAE,MAAM,CAAyB,GAC7C,MAAM,EAAE,EAAE,CAiBZ;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpC,MAAM,CAKR;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAQpE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAIpD"}

package/build/component/generator/utils.js

@@ -2,34 +2,32 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zipFolder = exports.getSampleRelativePath = exports.getSampleInfoFromName = exports.renderTemplateFileName = exports.renderTemplateFileData = exports.unzip = exports.fetchZipFromUrl = exports.fetchTemplateZipUrl = exports.fetchTagList = exports.templateVersion = void 0;
+exports.zipFolder = exports.getSampleRelativePath = exports.getSampleInfoFromName = exports.renderTemplateFileName = exports.escapeEmptyVariable = exports.renderTemplateFileData = exports.unzip = exports.fetchZipFromUrl = exports.fetchTemplateZipUrl = exports.sendRequestWithTimeout = exports.sendRequestWithRetry = void 0;
 const tslib_1 = require("tslib");
-const mustache_1 = tslib_1.__importDefault(require("mustache"));
+const mustache_1 = tslib_1.__importStar(require("mustache"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const constant_1 = require("./constant");
 const samples_1 = require("../../common/samples");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const axios_1 = tslib_1.__importDefault(require("axios"));
-const os_1 = require("os");
 const templates_config_json_1 = tslib_1.__importDefault(require("../../common/templates-config.json"));
 const samples_config_v3_json_1 = tslib_1.__importDefault(require("../../common/samples-config-v3.json"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
-const preRelease = process.env.TEAMSFX_TEMPLATE_PRERELEASE || "";
-const templateVersion = () => templates_config_json_1.default.version;
-exports.templateVersion = templateVersion;
-const templateTagPrefix = templates_config_json_1.default.tagPrefix;
-const templateTagListURL = templates_config_json_1.default.tagListURL;
-function selectTemplateTag(tags) {
-    if (preRelease === "alpha") {
-        return constant_1.templateAlphaVersion;
-    }
-    const versionPattern = preRelease ? `0.0.0-${preRelease}` : exports.templateVersion();
+const error_1 = require("./error");
+const tools_1 = require("../../common/tools");
+async function selectTemplateTag(getTags) {
+    const preRelease = process.env.TEAMSFX_TEMPLATE_PRERELEASE
+        ? `0.0.0-${process.env.TEAMSFX_TEMPLATE_PRERELEASE}`
+        : "";
+    const templateVersion = templates_config_json_1.default.version;
+    const templateTagPrefix = templates_config_json_1.default.tagPrefix;
+    const versionPattern = preRelease || templateVersion;
     // To avoid incompatible, alpha release does not download latest template.
-    if (versionPattern === constant_1.templateAlphaVersion) {
-        return undefined;
+    if ([constant_1.templateAlphaVersion, constant_1.templatePrereleaseVersion].includes(versionPattern)) {
+        throw new error_1.CancelDownloading();
     }
-    const versionList = tags.map((tag) => tag.replace(templateTagPrefix, ""));
+    const versionList = (await getTags()).map((tag) => tag.replace(templateTagPrefix, ""));
     const selectedVersion = semver_1.default.maxSatisfying(versionList, versionPattern);
     return selectedVersion ? templateTagPrefix + selectedVersion : undefined;
 }
@@ -56,6 +54,7 @@ async function sendRequestWithRetry(requestFn, tryLimits) {
     error !== null && error !== void 0 ? error : (error = new Error(`RequestWithRetry got bad tryLimits: ${tryLimits}`));
     throw error;
 }
+exports.sendRequestWithRetry = sendRequestWithRetry;
 async function sendRequestWithTimeout(requestFn, timeoutInMs, tryLimits = 1) {
     const source = axios_1.default.CancelToken.source();
     const timeout = setTimeout(() => {
@@ -73,6 +72,7 @@ async function sendRequestWithTimeout(requestFn, timeoutInMs, tryLimits = 1) {
         throw err;
     }
 }
+exports.sendRequestWithTimeout = sendRequestWithTimeout;
 async function fetchTagList(url, tryLimits, timeoutInMs) {
     const res = await sendRequestWithTimeout(async (cancelToken) => {
         return await axios_1.default.get(url, {
@@ -81,10 +81,9 @@ async function fetchTagList(url, tryLimits, timeoutInMs) {
     }, timeoutInMs, tryLimits);
     return res.data;
 }
-exports.fetchTagList = fetchTagList;
 async function fetchTemplateZipUrl(name, tryLimits = constant_1.defaultTryLimits, timeoutInMs = constant_1.defaultTimeoutInMs) {
-    const tags = await fetchTagList(templateTagListURL, tryLimits, timeoutInMs);
-    const selectedTag = selectTemplateTag(tags.replace(/\r/g, "").split("\n"));
+    const templateTagListURL = templates_config_json_1.default.tagListURL;
+    const selectedTag = await selectTemplateTag(async () => (await fetchTagList(templateTagListURL, tryLimits, timeoutInMs)).replace(/\r/g, "").split("\n"));
     if (!selectedTag) {
         throw new Error(`Failed to find valid template for ${name}`);
     }
@@ -92,18 +91,18 @@ async function fetchTemplateZipUrl(name, tryLimits = constant_1.defaultTryLimits
 }
 exports.fetchTemplateZipUrl = fetchTemplateZipUrl;
 async function fetchZipFromUrl(url, tryLimits = constant_1.defaultTryLimits, timeoutInMs = constant_1.defaultTimeoutInMs) {
-    const res = await sendRequestWithTimeout(async (cancelToken) => {
+    const res = await sendRequestWithRetry(async () => {
         return await axios_1.default.get(url, {
             responseType: "arraybuffer",
-            cancelToken: cancelToken,
+            timeout: timeoutInMs,
         });
-    }, timeoutInMs, tryLimits);
+    }, tryLimits);
     const zip = new adm_zip_1.default(res.data);
     return zip;
 }
 exports.fetchZipFromUrl = fetchZipFromUrl;
 /* The unzip used for scaffold which would drop the attr of the files and dirs. */
-async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, relativePath, filesInAppendMode = [".gitignore"]) {
+async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, relativePath) {
     let entries = zip.getEntries().filter((entry) => !entry.isDirectory);
     if (relativePath) {
         entries = entries.filter((entry) => entry.entryName.startsWith(relativePath));
@@ -122,25 +121,42 @@ async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, relativePath, f
         const filePath = path_1.default.join(dstPath, entryName);
         const dirPath = path_1.default.dirname(filePath);
         await fs.ensureDir(dirPath);
-        if (filesInAppendMode.includes(entryName) && (await fs.pathExists(filePath))) {
-            await fs.appendFile(filePath, os_1.EOL);
-            await fs.appendFile(filePath, entryData);
-        }
-        else {
-            await fs.writeFile(filePath, entryData);
-        }
+        await fs.writeFile(filePath, entryData);
     }
 }
 exports.unzip = unzip;
 function renderTemplateFileData(fileName, fileData, variables) {
     //only mustache files with name ending with .tpl
     if (path_1.default.extname(fileName) === constant_1.templateFileExt) {
-        return mustache_1.default.render(fileData.toString(), variables, {}, constant_1.placeholderDelimiters);
+        const token = escapeEmptyVariable(fileData.toString(), variables !== null && variables !== void 0 ? variables : {});
+        const writer = new mustache_1.Writer();
+        const result = writer.renderTokens(token, new mustache_1.Context(variables));
+        // Be compatible with current stable templates, can be removed after new template released.
+        return mustache_1.default.render(result, variables, {}, constant_1.oldPlaceholderDelimiters);
     }
     // Return Buffer instead of string if the file is not a template. Because `toString()` may break binary resources, like png files.
     return fileData;
 }
 exports.renderTemplateFileData = renderTemplateFileData;
+function escapeEmptyVariable(template, view, tags = constant_1.placeholderDelimiters) {
+    const parsed = mustache_1.default.parse(template, tags);
+    const tokens = tools_1.deepCopy(parsed); // Mustache cache the parsed result. Modify the result in place may cause unexpected issue.
+    let accShift = 0;
+    const shift = tags[0].length + tags[1].length;
+    // token: [Type, Value, Start, End]
+    for (const token of tokens) {
+        token[2] += accShift;
+        const value = token[1];
+        if (token[0] === "name" && (view[value] === undefined || view[value] === null)) {
+            token[0] = "text";
+            token[1] = tags[0] + value + tags[1];
+            accShift += shift;
+        }
+        token[3] += accShift;
+    }
+    return tokens;
+}
+exports.escapeEmptyVariable = escapeEmptyVariable;
 function renderTemplateFileName(fileName, fileData, variables) {
     return mustache_1.default.render(fileName, variables, {}, constant_1.placeholderDelimiters).replace(constant_1.templateFileExt, "");
 }

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

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

package/build/component/messages.d.ts

@@ -19,7 +19,7 @@ export declare class ProgressMessages {
     static readonly buildingTab: string;
     static readonly buildingBot: string;
     static readonly buildingApi: string;
-    static readonly packingCode: string;
+    static readonly packingCode: () => string;
     static readonly enableStaticWebsite: string;
     static readonly provisionBot: string;
     static readonly generateTemplate: () => string;
@@ -27,19 +27,8 @@ export declare class ProgressMessages {
     static readonly getDeploymentSrcAndDest: string;
     static readonly clearStorageAccount: string;
     static readonly uploadTabToStorage: string;
-    static readonly getAzureAccountInfoForDeploy: string;
-    static readonly getAzureUploadEndpoint: string;
-    static readonly uploadZipFileToAzure: string;
-    static readonly checkAzureDeployStatus: string;
-    static readonly restartAzureFunctionApp: string;
-    static readonly restartAzureService: string;
     static readonly configureAzureStorageEnableStaticWebsite: string;
-    static readonly checkAzureStorageEnableStaticWebsite: string;
-    static readonly azureStorageStaticWebsiteAlreadyEnabled: string;
-    static readonly enableAzureStorageStaticWebsite: string;
-    static readonly getAzureStorageAccountInfo: string;
-    static readonly clearStorageExistsBlobs: string;
-    static readonly uploadFilesToStorage: string;
+    static readonly runCommand: (command: string, directory: string) => string;
 }
 export declare class LogMessages {
     static readonly updateFunctionAppSettings: string;
@@ -47,7 +36,6 @@ export declare class LogMessages {
     static readonly getTemplateFrom: (url: string) => string;
     static readonly getTemplateFromLocal: string;
     static readonly projectScaffoldAt: (basePath: string) => string;
-    static readonly failedToInstallDotnet: (error: Error) => string;
     static readonly askFunctionName: string;
     static readonly FailedSaveEnv: (envPath: string) => string;
     static readonly FailedLoadEnv: (envPath: string) => string;

package/build/component/messages.d.ts.map

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