@microsoft/teamsfx-core 1.13.0 → 1.13.1-alpha.ae549cb45.0

package/build/component/code/apiCode.js

@@ -4,18 +4,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiCodeProvider = void 0;
 const tslib_1 = require("tslib");
+const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const path = tslib_1.__importStar(require("path"));
 require("reflect-metadata");
 const typedi_1 = require("typedi");
-const workflow_1 = require("../workflow");
+const question_1 = require("../../core/question");
 const constants_1 = require("../../plugins/resource/function/constants");
-const scaffold_1 = require("../../plugins/resource/function/ops/scaffold");
 const enums_1 = require("../../plugins/resource/function/enums");
-const constants_2 = require("../constants");
 const deploy_1 = require("../../plugins/resource/function/ops/deploy");
-const lodash_1 = require("lodash");
+const scaffold_1 = require("../../plugins/resource/function/ops/scaffold");
+const constants_2 = require("../constants");
 const messages_1 = require("../messages");
+const actionExecutionMW_1 = require("../middleware/actionExecutionMW");
+const workflow_1 = require("../workflow");
 /**
  * api scaffold
  */
@@ -23,10 +25,41 @@ let ApiCodeProvider = class ApiCodeProvider {
     constructor() {
         this.name = "api-code";
     }
-    generate(context, inputs) {
-        const action = {
-            name: "api-code.generate",
-            type: "function",
+    async generate(context, inputs, actionContext) {
+        var _a;
+        const projectSettings = context.projectSetting;
+        const appName = projectSettings.appName;
+        const language = inputs[question_1.CoreQuestionNames.ProgrammingLanguage];
+        const folder = inputs.folder || constants_1.FunctionPluginPathInfo.solutionFolderName;
+        const workingDir = path.join(inputs.projectPath, folder);
+        const functionName = inputs[enums_1.QuestionKey.functionName];
+        const variables = {
+            appName: appName,
+            functionName: functionName,
+        };
+        (_a = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.scaffoldApi);
+        await scaffold_1.FunctionScaffold.scaffoldFunction(workingDir, language, constants_1.DefaultValues.functionTriggerType, functionName, variables);
+        return teamsfx_api_1.ok(undefined);
+    }
+    async build(context, inputs, actionContext) {
+        var _a;
+        const teamsApi = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsApi);
+        if (!teamsApi)
+            return teamsfx_api_1.ok(undefined);
+        if (teamsApi.folder == undefined)
+            throw new Error("path not found");
+        const language = context.projectSetting.programmingLanguage;
+        if (!language || !Object.values(enums_1.FunctionLanguage).includes(language))
+            throw new Error("Invalid programming language found in project settings.");
+        (_a = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.buildingApi);
+        const buildPath = path.resolve(inputs.projectPath, teamsApi.folder);
+        await deploy_1.FunctionDeploy.build(buildPath, language);
+        return teamsfx_api_1.ok(undefined);
+    }
+};
+tslib_1.__decorate([
+    lib_1.hooks([
+        actionExecutionMW_1.ActionExecutionMW({
             enableProgressBar: true,
             progressTitle: messages_1.ProgressTitles.scaffoldApi,
             progressSteps: 1,
@@ -36,74 +69,27 @@ let ApiCodeProvider = class ApiCodeProvider {
             errorSource: "BE",
             errorIssueLink: constants_1.DefaultValues.issueLink,
             errorHelpLink: constants_1.DefaultValues.helpLink,
-            plan: (context, inputs) => {
-                const folder = inputs.folder || constants_1.FunctionPluginPathInfo.solutionFolderName;
-                return teamsfx_api_1.ok([messages_1.Plans.scaffold("api", path.join(inputs.projectPath, folder))]);
-            },
-            execute: async (ctx, inputs, progress) => {
-                var _a;
-                const projectSettings = ctx.projectSetting;
-                const appName = projectSettings.appName;
-                const language = (inputs === null || inputs === void 0 ? void 0 : inputs["programming-language"]) ||
-                    context.projectSetting.programmingLanguage ||
-                    "javascript";
-                const folder = inputs.folder || constants_1.FunctionPluginPathInfo.solutionFolderName;
-                const teamsApi = workflow_1.getComponent(projectSettings, constants_2.ComponentNames.TeamsApi);
-                if (!teamsApi)
-                    return teamsfx_api_1.ok([]);
-                lodash_1.merge(teamsApi, { build: true, folder: folder });
-                const workingDir = path.join(inputs.projectPath, folder);
-                const functionName = (_a = inputs === null || inputs === void 0 ? void 0 : inputs[enums_1.QuestionKey.functionName]) !== null && _a !== void 0 ? _a : constants_1.DefaultValues.functionName;
-                const variables = {
-                    appName: appName,
-                    functionName: functionName,
-                };
-                progress === null || progress === void 0 ? void 0 : progress.next(messages_1.ProgressMessages.scaffoldApi);
-                await scaffold_1.FunctionScaffold.scaffoldFunction(workingDir, language, constants_1.DefaultValues.functionTriggerType, functionName, variables);
-                return teamsfx_api_1.ok([messages_1.Plans.scaffold("api", workingDir)]);
-            },
-        };
-        return teamsfx_api_1.ok(action);
-    }
-    build(context, inputs) {
-        const action = {
-            name: "api-code.build",
-            type: "function",
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ApiCodeProvider.prototype, "generate", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        actionExecutionMW_1.ActionExecutionMW({
             enableProgressBar: true,
             progressTitle: messages_1.ProgressTitles.buildingApi,
             progressSteps: 1,
             enableTelemetry: true,
             telemetryComponentName: "fx-resource-function",
             telemetryEventName: "build",
-            plan: (context, inputs) => {
-                const teamsApi = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsApi);
-                if (!teamsApi)
-                    return teamsfx_api_1.ok([]);
-                const apiDir = teamsApi === null || teamsApi === void 0 ? void 0 : teamsApi.folder;
-                if (!apiDir)
-                    return teamsfx_api_1.ok([]);
-                return teamsfx_api_1.ok([messages_1.Plans.buildProject(apiDir)]);
-            },
-            execute: async (context, inputs, progress) => {
-                const teamsApi = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsApi);
-                if (!teamsApi)
-                    return teamsfx_api_1.ok([]);
-                if (teamsApi.folder == undefined)
-                    throw new Error("path not found");
-                const language = context.projectSetting.programmingLanguage;
-                if (!language || !Object.values(enums_1.FunctionLanguage).includes(language))
-                    throw new Error("Invalid programming language found in project settings.");
-                progress === null || progress === void 0 ? void 0 : progress.next(messages_1.ProgressMessages.buildingApi);
-                const buildPath = path.resolve(inputs.projectPath, teamsApi.folder);
-                await deploy_1.FunctionDeploy.build(buildPath, language);
-                const artifactFolder = teamsApi.artifactFolder || teamsApi.folder;
-                lodash_1.merge(teamsApi, { build: true, artifactFolder: path.join(artifactFolder) });
-                return teamsfx_api_1.ok([messages_1.Plans.buildProject(buildPath)]);
-            },
-        };
-        return teamsfx_api_1.ok(action);
-    }
-};
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ApiCodeProvider.prototype, "build", null);
 ApiCodeProvider = tslib_1.__decorate([
     typedi_1.Service("api-code")
 ], ApiCodeProvider);

package/build/component/code/apiCode.js.map

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

package/build/component/code/botCode.d.ts

@@ -1,12 +1,12 @@
-import { FxError, Result, Action, ContextV3, MaybePromise, SourceCodeProvider, InputsWithProjectPath } from "@microsoft/teamsfx-api";
+import { ActionContext, ContextV3, FxError, InputsWithProjectPath, Result } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
 /**
  * bot scaffold plugin
  */
-export declare class BotCodeProvider implements SourceCodeProvider {
+export declare class BotCodeProvider {
     name: string;
-    generate(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
-    build(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
+    generate(context: ContextV3, inputs: InputsWithProjectPath, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
+    build(context: ContextV3, inputs: InputsWithProjectPath, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
     /**
      * read dotnet framework version from project file
      * @param projectFilePath project base folder

package/build/component/code/botCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"botCode.d.ts","sourceRoot":"","sources":["../../../src/component/code/botCode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,MAAM,EACN,SAAS,EACT,YAAY,EAEZ,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,kBAAkB,CAAC;AA0B1B;;GAEG;AACH,qBACa,eAAgB,YAAW,kBAAkB;IACxD,IAAI,SAAc;IAClB,QAAQ,CACN,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAgFpD,KAAK,CACH,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAgEpD;;;OAGG;mBACkB,mBAAmB;CAWzC;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAepE"}
+{"version":3,"file":"botCode.d.ts","sourceRoot":"","sources":["../../../src/component/code/botCode.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,SAAS,EACT,OAAO,EACP,qBAAqB,EAGrB,MAAM,EACP,MAAM,wBAAwB,CAAC;AAIhC,OAAO,kBAAkB,CAAC;AA0B1B;;GAEG;AACH,qBACa,eAAe;IAC1B,IAAI,SAAc;IAeZ,QAAQ,CACZ,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,EAC7B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA0DhC,KAAK,CACT,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,EAC7B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA0CtC;;;OAGG;mBACkB,mBAAmB;CAWzC;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAepE"}

package/build/component/code/botCode.js

@@ -5,26 +5,28 @@ var BotCodeProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToLangKey = exports.BotCodeProvider = void 0;
 const tslib_1 = require("tslib");
+const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const fs = tslib_1.__importStar(require("fs-extra"));
 const lodash_1 = require("lodash");
 const path = tslib_1.__importStar(require("path"));
 require("reflect-metadata");
 const typedi_1 = require("typedi");
 const templatesActions_1 = require("../../common/template-utils/templatesActions");
+const utils_1 = require("../../common/utils");
+const question_1 = require("../../core/question");
 const constants_1 = require("../../plugins/resource/bot/constants");
 const programmingLanguage_1 = require("../../plugins/resource/bot/enums/programmingLanguage");
+const errors_1 = require("../../plugins/resource/bot/errors");
 const strings_1 = require("../../plugins/resource/bot/resources/strings");
-const error_1 = require("../../plugins/resource/bot/v3/error");
-const constants_2 = require("../constants");
-const workflow_1 = require("../workflow");
 const utils = tslib_1.__importStar(require("../../plugins/resource/bot/utils/common"));
-const fs = tslib_1.__importStar(require("fs-extra"));
-const errors_1 = require("../../plugins/resource/bot/errors");
-const question_1 = require("../../core/question");
-const utils_1 = require("../../common/utils");
 const telemetry_helper_1 = require("../../plugins/resource/bot/utils/telemetry-helper");
-const botService_1 = require("../resource/botService");
+const error_1 = require("../../plugins/resource/bot/v3/error");
+const constants_2 = require("../constants");
 const messages_1 = require("../messages");
+const actionExecutionMW_1 = require("../middleware/actionExecutionMW");
+const botService_1 = require("../resource/botService");
+const workflow_1 = require("../workflow");
 /**
  * bot scaffold plugin
  */
@@ -32,135 +34,90 @@ let BotCodeProvider = BotCodeProvider_1 = class BotCodeProvider {
     constructor() {
         this.name = "bot-code";
     }
-    generate(context, inputs) {
-        const action = {
-            name: "bot-code.generate",
-            type: "function",
-            enableProgressBar: true,
-            progressTitle: messages_1.ProgressTitles.scaffoldBot,
-            progressSteps: 1,
-            enableTelemetry: true,
-            telemetryProps: botService_1.commonTelemetryPropsForBot(context),
-            telemetryComponentName: "fx-resource-bot",
-            telemetryEventName: "scaffold",
-            errorHandler: (e, t) => {
-                telemetry_helper_1.telemetryHelper.fillAppStudioErrorProperty(e, t);
-                return e;
-            },
-            plan: (context, inputs) => {
-                const teamsBot = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsBot);
-                if (!teamsBot)
-                    return teamsfx_api_1.ok([]);
-                const folder = inputs.folder || strings_1.CommonStrings.BOT_WORKING_DIR_NAME;
-                return teamsfx_api_1.ok([messages_1.Plans.scaffold("bot", path.join(inputs.projectPath, folder))]);
-            },
-            execute: async (context, inputs, progress) => {
-                var _a;
-                const projectSettings = context.projectSetting;
-                const appName = projectSettings.appName;
-                const language = (inputs === null || inputs === void 0 ? void 0 : inputs["programming-language"]) ||
-                    context.projectSetting.programmingLanguage ||
-                    "javascript";
-                const botFolder = inputs.folder || language === "csharp" ? "" : strings_1.CommonStrings.BOT_WORKING_DIR_NAME;
-                const teamsBot = workflow_1.getComponent(projectSettings, constants_2.ComponentNames.TeamsBot);
-                if (!teamsBot)
-                    return teamsfx_api_1.ok([]);
-                lodash_1.merge(teamsBot, { build: true, folder: botFolder });
-                const group_name = constants_1.TemplateProjectsConstants.GROUP_NAME_BOT;
-                const lang = convertToLangKey(language);
-                const workingDir = path.join(inputs.projectPath, botFolder);
-                const safeProjectName = (_a = inputs[question_1.CoreQuestionNames.SafeProjectName]) !== null && _a !== void 0 ? _a : utils_1.convertToAlphanumericOnly(appName);
-                await (progress === null || progress === void 0 ? void 0 : progress.next(messages_1.ProgressMessages.scaffoldBot));
-                for (const scenario of inputs.scenarios) {
-                    await templatesActions_1.scaffoldFromTemplates({
-                        group: group_name,
-                        lang: lang,
-                        scenario: scenario,
-                        dst: workingDir,
-                        fileDataReplaceFn: templatesActions_1.genTemplateRenderReplaceFn({
-                            ProjectName: appName,
-                            SafeProjectName: safeProjectName,
-                        }),
-                        fileNameReplaceFn: (name, data) => name.replace(/ProjectName/, appName).replace(/\.tpl/, ""),
-                        onActionError: async (action, context, error) => {
-                            switch (action.name) {
-                                case templatesActions_1.ScaffoldActionName.FetchTemplatesUrlWithTag:
-                                case templatesActions_1.ScaffoldActionName.FetchTemplatesZipFromUrl:
-                                    break;
-                                case templatesActions_1.ScaffoldActionName.FetchTemplateZipFromLocal:
-                                    throw new error_1.TemplateZipFallbackError();
-                                case templatesActions_1.ScaffoldActionName.Unzip:
-                                    throw new error_1.UnzipError(context.dst);
-                                default:
-                                    throw new Error(error.message);
-                            }
-                        },
-                    });
-                }
-                return teamsfx_api_1.ok([messages_1.Plans.scaffold("bot", path.join(inputs.projectPath, botFolder))]);
-            },
-        };
-        return teamsfx_api_1.ok(action);
-    }
-    build(context, inputs) {
-        const action = {
-            name: "bot-code.build",
-            type: "function",
-            enableProgressBar: true,
-            progressTitle: messages_1.ProgressTitles.buildingBot,
-            progressSteps: 1,
-            enableTelemetry: true,
-            telemetryProps: botService_1.commonTelemetryPropsForBot(context),
-            telemetryComponentName: "fx-resource-bot",
-            telemetryEventName: "build",
-            plan: (context, inputs) => {
-                const teamsBot = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsBot);
-                if (!teamsBot)
-                    return teamsfx_api_1.ok([]);
-                const packDir = teamsBot === null || teamsBot === void 0 ? void 0 : teamsBot.folder;
-                if (!packDir)
-                    return teamsfx_api_1.ok([]);
-                return teamsfx_api_1.ok([messages_1.Plans.buildProject(packDir)]);
-            },
-            execute: async (context, inputs, progress) => {
-                const teamsBot = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsBot);
-                if (!teamsBot)
-                    return teamsfx_api_1.ok([]);
-                const packDir = path.join(inputs.projectPath, teamsBot.folder);
-                const language = context.projectSetting.programmingLanguage || "javascript";
-                await (progress === null || progress === void 0 ? void 0 : progress.next(messages_1.ProgressMessages.buildingBot));
-                if (language === programmingLanguage_1.ProgrammingLanguage.TypeScript) {
-                    //Typescript needs tsc build before deploy because of windows app server. other languages don"t need it.
-                    try {
-                        await utils.execute("npm install", packDir);
-                        await utils.execute("npm run build", packDir);
-                        lodash_1.merge(teamsBot, { build: true, artifactFolder: teamsBot.folder });
-                    }
-                    catch (e) {
-                        throw new errors_1.CommandExecutionError(`${strings_1.Commands.NPM_INSTALL}, ${strings_1.Commands.NPM_BUILD}`, packDir, e);
-                    }
-                }
-                else if (language === programmingLanguage_1.ProgrammingLanguage.JavaScript) {
-                    try {
-                        // fail to npm install @microsoft/teamsfx on azure web app, so pack it locally.
-                        await utils.execute("npm install", packDir);
-                        lodash_1.merge(teamsBot, { build: true, artifactFolder: teamsBot.folder });
-                    }
-                    catch (e) {
-                        throw new errors_1.CommandExecutionError(`${strings_1.Commands.NPM_INSTALL}`, packDir, e);
+    async generate(context, inputs, actionContext) {
+        var _a, _b, _c;
+        if (actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps) {
+            lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, botService_1.commonTelemetryPropsForBot(context));
+        }
+        const projectSettings = context.projectSetting;
+        const appName = projectSettings.appName;
+        const language = (inputs === null || inputs === void 0 ? void 0 : inputs["programming-language"]) ||
+            context.projectSetting.programmingLanguage ||
+            "javascript";
+        const botFolder = (_a = inputs.folder) !== null && _a !== void 0 ? _a : (language === "csharp" ? "" : strings_1.CommonStrings.BOT_WORKING_DIR_NAME);
+        const group_name = constants_1.TemplateProjectsConstants.GROUP_NAME_BOT;
+        const lang = convertToLangKey(language);
+        const workingDir = path.join(inputs.projectPath, botFolder);
+        const safeProjectName = (_b = inputs[question_1.CoreQuestionNames.SafeProjectName]) !== null && _b !== void 0 ? _b : utils_1.convertToAlphanumericOnly(appName);
+        await ((_c = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _c === void 0 ? void 0 : _c.next(messages_1.ProgressMessages.scaffoldBot));
+        for (const scenario of inputs.scenarios) {
+            await templatesActions_1.scaffoldFromTemplates({
+                group: group_name,
+                lang: lang,
+                scenario: scenario,
+                dst: workingDir,
+                fileDataReplaceFn: templatesActions_1.genTemplateRenderReplaceFn({
+                    ProjectName: appName,
+                    SafeProjectName: safeProjectName,
+                }),
+                fileNameReplaceFn: (name, data) => name.replace(/ProjectName/, appName).replace(/\.tpl/, ""),
+                onActionError: async (action, context, error) => {
+                    switch (action.name) {
+                        case templatesActions_1.ScaffoldActionName.FetchTemplatesUrlWithTag:
+                        case templatesActions_1.ScaffoldActionName.FetchTemplatesZipFromUrl:
+                            break;
+                        case templatesActions_1.ScaffoldActionName.FetchTemplateZipFromLocal:
+                            throw new error_1.TemplateZipFallbackError();
+                        case templatesActions_1.ScaffoldActionName.Unzip:
+                            throw new error_1.UnzipError(context.dst);
+                        default:
+                            throw new Error(error.message);
                     }
-                }
-                else if (language === programmingLanguage_1.ProgrammingLanguage.Csharp) {
-                    const projectFileName = `${context.projectSetting.appName}.csproj`;
-                    const framework = await BotCodeProvider_1.getFrameworkVersion(path.join(packDir, projectFileName));
-                    await utils.execute(`dotnet publish --configuration Release`, packDir);
-                    const artifactFolder = path.join(".", "bin", "Release", framework, "publish");
-                    lodash_1.merge(teamsBot, { build: true, artifactFolder: artifactFolder });
-                }
-                return teamsfx_api_1.ok([messages_1.Plans.buildProject(packDir)]);
-            },
-        };
-        return teamsfx_api_1.ok(action);
+                },
+            });
+        }
+        return teamsfx_api_1.ok(undefined);
+    }
+    async build(context, inputs, actionContext) {
+        var _a;
+        if (actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps) {
+            lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, botService_1.commonTelemetryPropsForBot(context));
+        }
+        const teamsBot = workflow_1.getComponent(context.projectSetting, constants_2.ComponentNames.TeamsBot);
+        if (!teamsBot)
+            return teamsfx_api_1.ok(undefined);
+        const packDir = path.join(inputs.projectPath, teamsBot.folder);
+        const language = context.projectSetting.programmingLanguage || "javascript";
+        await ((_a = actionContext === null || actionContext === void 0 ? void 0 : actionContext.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.buildingBot));
+        if (language === programmingLanguage_1.ProgrammingLanguage.TypeScript) {
+            //Typescript needs tsc build before deploy because of windows app server. other languages don"t need it.
+            try {
+                await utils.execute("npm install", packDir);
+                await utils.execute("npm run build", packDir);
+                lodash_1.merge(teamsBot, { build: true, artifactFolder: teamsBot.folder });
+            }
+            catch (e) {
+                throw new errors_1.CommandExecutionError(`${strings_1.Commands.NPM_INSTALL}, ${strings_1.Commands.NPM_BUILD}`, packDir, e);
+            }
+        }
+        else if (language === programmingLanguage_1.ProgrammingLanguage.JavaScript) {
+            try {
+                // fail to npm install @microsoft/teamsfx on azure web app, so pack it locally.
+                await utils.execute("npm install", packDir);
+                lodash_1.merge(teamsBot, { build: true, artifactFolder: teamsBot.folder });
+            }
+            catch (e) {
+                throw new errors_1.CommandExecutionError(`${strings_1.Commands.NPM_INSTALL}`, packDir, e);
+            }
+        }
+        else if (language === programmingLanguage_1.ProgrammingLanguage.Csharp) {
+            const projectFileName = `${context.projectSetting.appName}.csproj`;
+            const framework = await BotCodeProvider_1.getFrameworkVersion(path.join(packDir, projectFileName));
+            await utils.execute(`dotnet publish --configuration Release`, packDir);
+            const artifactFolder = path.join(".", "bin", "Release", framework, "publish");
+            lodash_1.merge(teamsBot, { build: true, artifactFolder: artifactFolder });
+        }
+        return teamsfx_api_1.ok(undefined);
     }
     /**
      * read dotnet framework version from project file
@@ -179,6 +136,40 @@ let BotCodeProvider = BotCodeProvider_1 = class BotCodeProvider {
         return constants_1.DEFAULT_DOTNET_FRAMEWORK;
     }
 };
+tslib_1.__decorate([
+    lib_1.hooks([
+        actionExecutionMW_1.ActionExecutionMW({
+            enableProgressBar: true,
+            progressTitle: messages_1.ProgressTitles.scaffoldBot,
+            progressSteps: 1,
+            enableTelemetry: true,
+            telemetryComponentName: "fx-resource-bot",
+            telemetryEventName: "scaffold",
+            errorHandler: (e, t) => {
+                telemetry_helper_1.telemetryHelper.fillAppStudioErrorProperty(e, t);
+                return e;
+            },
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BotCodeProvider.prototype, "generate", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        actionExecutionMW_1.ActionExecutionMW({
+            enableProgressBar: true,
+            progressTitle: messages_1.ProgressTitles.buildingBot,
+            progressSteps: 1,
+            enableTelemetry: true,
+            telemetryComponentName: "fx-resource-bot",
+            telemetryEventName: "build",
+        }),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BotCodeProvider.prototype, "build", null);
 BotCodeProvider = BotCodeProvider_1 = tslib_1.__decorate([
     typedi_1.Service("bot-code")
 ], BotCodeProvider);

package/build/component/code/botCode.js.map

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

package/build/component/code/spfxTabCode.d.ts

@@ -1,11 +1,11 @@
-import { Action, ContextV3, FxError, InputsWithProjectPath, MaybePromise, PluginContext, Result, SourceCodeProvider } from "@microsoft/teamsfx-api";
+import { ContextV3, FxError, InputsWithProjectPath, PluginContext, Result } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
 /**
  * SPFx tab scaffold
  */
-export declare class SPFxTabCodeProvider implements SourceCodeProvider {
+export declare class SPFxTabCodeProvider {
     name: string;
-    generate(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
+    generate(context: ContextV3, inputs: InputsWithProjectPath): Promise<Result<undefined, FxError>>;
 }
 export declare function scaffoldSPFx(context: ContextV3 | PluginContext, inputs: InputsWithProjectPath, outputFolderPath: string): Promise<Result<any, FxError>>;
 //# sourceMappingURL=spfxTabCode.d.ts.map

package/build/component/code/spfxTabCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spfxTabCode.d.ts","sourceRoot":"","sources":["../../../src/component/code/spfxTabCode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,SAAS,EAET,OAAO,EAEP,qBAAqB,EAErB,YAAY,EAGZ,aAAa,EAEb,MAAM,EACN,kBAAkB,EAEnB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,kBAAkB,CAAC;AAsB1B;;GAEG;AACH,qBACa,mBAAoB,YAAW,kBAAkB;IAC5D,IAAI,SAA8B;IAClC,QAAQ,CACN,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CA4BrD;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,SAAS,GAAG,aAAa,EAClC,MAAM,EAAE,qBAAqB,EAC7B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAyM/B"}
+{"version":3,"file":"spfxTabCode.d.ts","sourceRoot":"","sources":["../../../src/component/code/spfxTabCode.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,SAAS,EAET,OAAO,EAEP,qBAAqB,EAIrB,aAAa,EAEb,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAIhC,OAAO,kBAAkB,CAAC;AAuB1B;;GAEG;AACH,qBACa,mBAAmB;IAC9B,IAAI,SAA8B;IAS5B,QAAQ,CACZ,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAWvC;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,SAAS,GAAG,aAAa,EAClC,MAAM,EAAE,qBAAqB,EAC7B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAyM/B"}