@microsoft/teamsfx-core 2.0.7-alpha.409a3da2f.0 → 2.0.7-alpha.44548b1b3.0

package/build/component/generator/generatorAction.js

@@ -2,46 +2,65 @@
 // 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.fetchSampleInfoAction = exports.fetchTemplateZipFromSourceCodeAction = exports.GeneratorActionName = void 0;
+exports.SampleActionSeq = exports.TemplateActionSeq = exports.downloadDirectoryAction = exports.fetchSampleInfoAction = exports.ScaffoldLocalTemplateAction = exports.ScaffoldRemoteTemplateAction = 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"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const constants_1 = require("../../common/constants");
 const folder_1 = require("../../folder");
 const error_1 = require("./error");
 const utils_1 = require("./utils");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const templates_config_json_1 = tslib_1.__importDefault(require("../../common/templates-config.json"));
 var GeneratorActionName;
 (function (GeneratorActionName) {
-    GeneratorActionName["FetchTemplateZipFromSourceCode"] = "FetchTemplateZipFromSourceCodeAction";
-    GeneratorActionName["FetchTemplateUrlWithTag"] = "FetchTemplatesUrlWithTag";
-    GeneratorActionName["FetchZipFromUrl"] = "FetchZipFromUrl";
-    GeneratorActionName["FetchTemplateZipFromLocal"] = "FetchTemplateZipFromLocal";
+    GeneratorActionName["ScaffoldRemoteTemplate"] = "ScaffoldRemoteTemplate";
+    GeneratorActionName["ScaffoldLocalTemplate"] = "ScaffoldLocalTemplate";
     GeneratorActionName["FetchSampleInfo"] = "FetchSampleInfo";
     GeneratorActionName["DownloadDirectory"] = "DownloadDirectory";
-    GeneratorActionName["Unzip"] = "Unzip";
 })(GeneratorActionName = exports.GeneratorActionName || (exports.GeneratorActionName = {}));
-// * This action is only for debug purpose
-exports.fetchTemplateZipFromSourceCodeAction = {
-    name: GeneratorActionName.FetchTemplateZipFromSourceCode,
-    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 Promise.resolve();
+exports.ScaffoldRemoteTemplateAction = {
+    name: GeneratorActionName.ScaffoldRemoteTemplate,
+    run: async (context) => {
+        const templateUrl = await determineTemplateSource(context);
+        if (templateUrl === "local") {
+            return;
         }
-        if (context.zip) {
-            return Promise.resolve();
+        const zip = await utils_1.fetchZipFromUrl(templateUrl, context.tryLimits, context.timeoutInMs);
+        context.outputs = await utils_1.unzip(zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
+    },
+};
+exports.ScaffoldLocalTemplateAction = {
+    name: GeneratorActionName.ScaffoldLocalTemplate,
+    run: async (context) => {
+        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)}`);
+        const fallbackPath = path_1.default.join(folder_1.getTemplatesFolder(), "fallback");
+        const fileName = `${context.language}.zip`;
+        const zipPath = path_1.default.join(fallbackPath, fileName);
+        const data = await fs_extra_1.default.readFile(zipPath);
+        const zip = new adm_zip_1.default(data);
+        context.outputs = await utils_1.unzip(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);
         }
-        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.language);
-        context.zip = utils_1.zipFolder(templateSourceCodePath);
-        return Promise.resolve();
     },
 };
+async function determineTemplateSource(context) {
+    let url = "local";
+    if (!Boolean(templates_config_json_1.default.useLocalTemplate)) {
+        let latestTag = await utils_1.getTemplateLatestTag(context.language, context.tryLimits, context.timeoutInMs);
+        latestTag = latestTag.replace(templates_config_json_1.default.tagPrefix, "").trim();
+        if (semver_1.default.gt(latestTag, templates_config_json_1.default.localVersion)) {
+            // git tag version is higher than the local version, download template from github
+            url = `${templates_config_json_1.default.templateDownloadBaseURL}/${latestTag}/${context.language}.zip`;
+        }
+    }
+    return url;
+}
 exports.fetchSampleInfoAction = {
     name: GeneratorActionName.FetchSampleInfo,
     run: async (context) => {
@@ -63,69 +82,9 @@ exports.downloadDirectoryAction = {
         }
     },
 };
-exports.fetchTemplateUrlWithTagAction = {
-    name: GeneratorActionName.FetchTemplateUrlWithTag,
-    run: async (context) => {
-        if (context.zip || context.url || context.cancelDownloading) {
-            return;
-        }
-        context.logProvider.debug(`Fetching template url with tag: ${JSON.stringify(context)}`);
-        context.url = await utils_1.fetchTemplateZipUrl(context.language, context.tryLimits, context.timeoutInMs);
-    },
-};
-exports.fetchZipFromUrlAction = {
-    name: GeneratorActionName.FetchZipFromUrl,
-    run: async (context) => {
-        if (context.zip || context.cancelDownloading) {
-            return;
-        }
-        context.logProvider.debug(`Fetching zip from url: ${JSON.stringify(context)}`);
-        if (!context.url) {
-            throw new error_1.MissKeyError("url");
-        }
-        context.zip = await utils_1.fetchZipFromUrl(context.url, context.tryLimits, context.timeoutInMs);
-    },
-};
-exports.fetchTemplateFromLocalAction = {
-    name: GeneratorActionName.FetchTemplateZipFromLocal,
-    run: async (context) => {
-        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.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 = {
-    name: GeneratorActionName.Unzip,
-    run: async (context) => {
-        if (!context.zip) {
-            return;
-        }
-        context.logProvider.debug(`Unzipping: ${JSON.stringify(context)}`);
-        context.outputs = await utils_1.unzip(context.zip, context.destination, context.fileNameReplaceFn, context.fileDataReplaceFn, context.filterFn);
-    },
-};
 exports.TemplateActionSeq = [
-    exports.fetchTemplateZipFromSourceCodeAction,
-    exports.fetchTemplateUrlWithTagAction,
-    exports.fetchZipFromUrlAction,
-    exports.unzipAction,
-    exports.fetchTemplateFromLocalAction,
-];
-exports.SampleActionSeq = [exports.fetchZipFromUrlAction, exports.unzipAction];
-exports.DownloadDirectoryActionSeq = [
-    exports.fetchSampleInfoAction,
-    exports.downloadDirectoryAction,
+    exports.ScaffoldRemoteTemplateAction,
+    exports.ScaffoldLocalTemplateAction,
 ];
+exports.SampleActionSeq = [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/config/projectProperties.d.ts

@@ -9,6 +9,7 @@ export declare const projectProperties: {
                     repository: string;
                     branch: string;
                     prerelease: string;
+                    archive: string;
                 };
             };
             supportedHosts: string[];

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":"AAGA,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqC7B,CAAC"}

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

@@ -14,6 +14,7 @@ exports.projectProperties = {
                     repository: "https://github.com/OfficeDev/Office-Addin-TaskPane",
                     branch: "json-preview-yo-office",
                     prerelease: "json-preview-yo-office-prerelease",
+                    archive: "https://aka.ms/teams-toolkit/office-addin-taskpane",
                 },
             },
             supportedHosts: ["Outlook"],

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,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"}
+{"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;oBAC/C,OAAO,EAAE,oDAAoD;iBAC9D;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

@@ -12,9 +12,6 @@ export default class projectsJsonData {
     getHostDisplayName(hostKey: string): string | undefined;
     getProjectTemplateRepository(projectTypeKey: string, scriptType: string): string | undefined;
     getProjectTemplateBranchName(projectTypeKey: string, scriptType: string, prerelease: boolean): string | undefined;
-    getProjectRepoAndBranch(projectTypeKey: string, scriptType: string, prerelease: boolean): {
-        repo: string | undefined;
-        branch: string | undefined;
-    };
+    getProjectDownloadLink(projectTypeKey: string, scriptType: string): string;
 }
 //# sourceMappingURL=projectsJsonData.d.ts.map

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":"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"}
+{"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,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAK3E"}

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

@@ -98,17 +98,10 @@ class projectsJsonData {
         }
         return undefined;
     }
-    getProjectRepoAndBranch(projectTypeKey, scriptType, prerelease) {
-        scriptType = scriptType === "TypeScript" ? "typescript" : "javascript";
-        const repoBranchInfo = {
-            repo: null,
-            branch: null,
-        };
-        repoBranchInfo.repo = this.getProjectTemplateRepository(projectTypeKey, scriptType);
-        repoBranchInfo.branch = repoBranchInfo.repo
-            ? this.getProjectTemplateBranchName(projectTypeKey, scriptType, prerelease)
-            : undefined;
-        return repoBranchInfo;
+    getProjectDownloadLink(projectTypeKey, scriptType) {
+        scriptType = scriptType.toLowerCase();
+        return this.projectJsonData.projectTypes[projectTypeKey].templates[scriptType]
+            .archive;
     }
 }
 exports.default = projectsJsonData;

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":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,4DAAuB;AACvB,2DAAwD;AAExD,MAAqB,gBAAgB;IAInC;QACE,IAAI,CAAC,eAAe,GAAG,qCAAiB,CAAC;IAC3C,CAAC;IAED,qBAAqB,CAAC,WAAmB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/E,CAAC;IAED,iBAAiB,CAAC,WAAmB;QACnC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1E,CAAC;IAED,wBAAwB;QACtB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,uBAAuB;QACrB,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;YACnD,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,sBAAsB,CAAC,WAAmB;QACxC,OAAO,CACL,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,IAAI,SAAS;YAC3F,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,gBAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,IAAI,SAAS,CAC5F,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,WAAmB;QACjC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC;IACrE,CAAC;IAED,oBAAoB,CAAC,WAAmB;QACtC,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,IAAI,WAAW,EAAE;YACf,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;gBACnD,IAAI,GAAG,KAAK,WAAW,EAAE;oBACvB,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC;iBAC/D;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uBAAuB,CAAC,WAAmB;QACzC,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,IAAI,WAAW,EAAE;YACf,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE;gBAC/E,IAAI,UAAU,GAAG,EAAE,CAAC;gBACpB,IAAI,QAAQ,KAAK,YAAY,EAAE;oBAC7B,UAAU,GAAG,YAAY,CAAC;iBAC3B;qBAAM,IAAI,QAAQ,KAAK,YAAY,EAAE;oBACpC,UAAU,GAAG,YAAY,CAAC;iBAC3B;gBAED,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC9B;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,kBAAkB,CAAC,OAAe;QAChC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;YAChD,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE;gBAC7B,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;aACxD;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,4BAA4B,CAAC,cAAsB,EAAE,UAAkB;QACrE,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;YACnD,IAAI,gBAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,GAAG,EAAE;gBACpC,IAAI,cAAc,IAAI,UAAU,EAAE;oBAChC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC;iBACjF;qBAAM;oBACL,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC;iBAChF;aACF;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,4BAA4B,CAC1B,cAAsB,EACtB,UAAkB,EAClB,UAAmB;QAEnB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE;YACnD,IAAI,gBAAC,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,GAAG,EAAE;gBACpC,IAAI,cAAc,IAAI,UAAU,EAAE;oBAChC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC;iBACpE;qBAAM;oBACL,IAAI,UAAU,EAAE;wBACd,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC;qBAChF;yBAAM;wBACL,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;qBAC5E;iBACF;aACF;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,sBAAsB,CAAC,cAAsB,EAAE,UAAkB;QAC/D,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC;aAC3E,OAAiB,CAAC;IACvB,CAAC;CACF;AApHD,mCAoHC"}

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;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"}
+{"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;AAsBhC,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;WAqBlB,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;CAqEvC"}

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

@@ -14,7 +14,6 @@ const office_addin_manifest_1 = require("office-addin-manifest");
 const projectsJsonData_1 = tslib_1.__importDefault(require("./config/projectsJsonData"));
 const childProcess = tslib_1.__importStar(require("child_process"));
 const util_1 = require("util");
-const error_1 = require("../../../core/error");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const lib_1 = require("@feathersjs/hooks/lib");
 const actionExecutionMW_1 = require("../../middleware/actionExecutionMW");
@@ -23,6 +22,7 @@ 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 error_1 = require("../../../error");
 const componentName = "office-addin";
 const telemetryEvent = "generate";
 const templateName = "office-addin";
@@ -34,7 +34,8 @@ class OfficeAddinGenerator {
         }
         // If lang is undefined, it means the project is created from a folder.
         const lang = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
-        const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, templateName, lang != "No Options" ? (lang === "TypeScript" ? "ts" : "js") : undefined);
+        const langKey = lang != "No Options" ? ((lang === null || lang === void 0 ? void 0 : lang.toLowerCase()) === "typescript" ? "ts" : "js") : undefined;
+        const templateRes = await generator_1.Generator.generateTemplate(context, destinationPath, templateName, langKey);
         if (templateRes.isErr())
             return teamsfx_api_1.err(templateRes.error);
         return teamsfx_api_1.ok(undefined);
@@ -56,10 +57,10 @@ class OfficeAddinGenerator {
             if (!fromFolder) {
                 // from template
                 const jsonData = new projectsJsonData_1.default();
-                const projectRepoBranchInfo = jsonData.getProjectRepoAndBranch(template, language, true);
+                const projectLink = jsonData.getProjectDownloadLink(template, language);
                 // Copy project template files from project repository
-                if (projectRepoBranchInfo.repo) {
-                    await helperMethods_1.HelperMethods.downloadProjectTemplateZipFile(addinRoot, projectRepoBranchInfo.repo, projectRepoBranchInfo.branch);
+                if (projectLink) {
+                    await helperMethods_1.HelperMethods.downloadProjectTemplateZipFile(addinRoot, projectLink);
                     // Call 'convert-to-single-host' npm script in generated project, passing in host parameter
                     const cmdLine = `npm run convert-to-single-host --if-present -- ${lodash_1.default.toLower(host)}`;
                     await OfficeAddinGenerator.childProcessExec(cmdLine);
@@ -93,7 +94,7 @@ class OfficeAddinGenerator {
         catch (e) {
             process.chdir(workingDir);
             await importProgress.end(false, true);
-            return teamsfx_api_1.err(error_1.CopyFileError(e));
+            return teamsfx_api_1.err(error_1.assembleError(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

@@ -1,9 +1,10 @@
 export declare class HelperMethods {
-    static downloadProjectTemplateZipFile(projectFolder: string, projectRepo: string, projectBranch?: string): Promise<void>;
+    static downloadProjectTemplateZipFile(projectFolder: string, projectRepo: string): Promise<void>;
     static unzipProjectTemplate(projectFolder: string): Promise<void>;
     static moveUnzippedFiles(projectFolder: string): void;
     static copyAddinFiles(fromFolder: string, toFolder: string): void;
     static updateManifest(projectRoot: string, addinManifestPath: string): Promise<void>;
     static moveManifestLocation(projectRoot: string, manifestRelativePath: string): Promise<void>;
 }
+export declare function unzipErrorHandler(projectFolder: string, reject: any, error: Error): void;
 //# sourceMappingURL=helperMethods.d.ts.map

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":"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;WAwB7E,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":"AAiBA,qBAAa,aAAa;WACX,8BAA8B,CACzC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;WAqCH,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;WAwB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;CA2CjB;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}

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

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HelperMethods = void 0;
+exports.unzipErrorHandler = exports.HelperMethods = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author darrmill@microsoft.com, yefuwang@microsoft.com
@@ -14,19 +14,24 @@ const path = tslib_1.__importStar(require("path"));
 const unzip = tslib_1.__importStar(require("unzipper"));
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
+const common_1 = require("../../../error/common");
 const zipFile = "project.zip";
 class HelperMethods {
-    static async downloadProjectTemplateZipFile(projectFolder, projectRepo, projectBranch) {
-        const projectTemplateZipFile = `${projectRepo}/archive/${projectBranch || ""}.zip`;
-        const response = await node_fetch_1.default(projectTemplateZipFile, { method: "GET" });
+    static async downloadProjectTemplateZipFile(projectFolder, projectRepo) {
+        const projectTemplateZipFile = projectRepo;
+        let response;
+        try {
+            response = await node_fetch_1.default(projectTemplateZipFile, { method: "GET" });
+        }
+        catch (e) {
+            throw new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", e);
+        }
         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}`);
+                    reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", err));
                 })
                     .on("close", () => {
                     HelperMethods.unzipProjectTemplate(projectFolder)
@@ -39,7 +44,7 @@ class HelperMethods {
                 });
             }
             else {
-                reject(`Response body is null.`);
+                reject(new common_1.AccessGithubError(projectTemplateZipFile, "OfficeAddinGenerator", new Error(`Response body of GET "${projectTemplateZipFile}" is null.`)));
             }
         });
     }
@@ -50,8 +55,7 @@ class HelperMethods {
             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}`);
+                unzipErrorHandler(projectFolder, reject, err);
             })
                 .on("close", () => {
                 HelperMethods.moveUnzippedFiles(projectFolder);
@@ -135,4 +139,11 @@ class HelperMethods {
     }
 }
 exports.HelperMethods = HelperMethods;
+function unzipErrorHandler(projectFolder, reject, error) {
+    if (error.message) {
+        error.message = `Unable to unzip project zip file for "${projectFolder}", reason: ${error.message}`;
+    }
+    reject(new common_1.ReadFileError(error, "OfficeAddinGenerator"));
+}
+exports.unzipErrorHandler = unzipErrorHandler;
 //# sourceMappingURL=helperMethods.js.map

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

@@ -5,7 +5,8 @@ import { AxiosResponse, CancelToken } from "axios";
 import { AxiosError } 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 getTemplateLatestTag(name: string, tryLimits?: number, timeoutInMs?: number): Promise<string>;
+export declare function getTemplateZipUrlByTag(name: string, selectedTag: string): 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, filterFn?: (filePath: string) => boolean): Promise<string[]>;
 export declare function renderTemplateFileData(fileName: string, fileData: Buffer, variables?: {

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