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

package/build/component/driver/prerequisite/installDriver.js

@@ -8,34 +8,65 @@ const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
 const deps_checker_1 = require("../../../common/deps-checker");
 const localCertificateManager_1 = require("../../../common/local/localCertificateManager");
+const common_1 = require("../../utils/common");
 const wrapUtil_1 = require("../util/wrapUtil");
 const constant_1 = require("./constant");
 const dotnetInstallationUserError_1 = require("./error/dotnetInstallationUserError");
 const funcInstallationUserError_1 = require("./error/funcInstallationUserError");
-const invalidParameterUserError_1 = require("./error/invalidParameterUserError");
+const common_2 = require("../../../error/common");
+const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
+const updateProgress_1 = require("../middleware/updateProgress");
+const lib_1 = require("@feathersjs/hooks/lib");
+const localizeUtils_1 = require("../../../common/localizeUtils");
 const ACTION_NAME = "prerequisite/install";
-const outputName = Object.freeze({
-    SSL_CRT_FILE: "SSL_CRT_FILE",
-    SSL_KEY_FILE: "SSL_KEY_FILE",
-    FUNC_PATH: "FUNC_PATH",
-    DOTNET_PATH: "DOTNET_PATH",
-});
 const helpLink = "https://aka.ms/teamsfx-actions/prerequisite-install";
+const outputKeys = {
+    sslCertFile: "sslCertFile",
+    sslKeyFile: "sslKeyFile",
+    funcPath: "funcPath",
+    dotnetPath: "dotnetPath",
+};
 let ToolsInstallDriver = class ToolsInstallDriver {
     constructor() {
         this.description = constant_1.toolsInstallDescription();
     }
     async run(args, context) {
-        const wrapContext = new wrapUtil_1.WrapDriverContext(context, ACTION_NAME, ACTION_NAME);
-        const impl = new ToolsInstallDriverImpl(wrapContext);
-        return (await wrapUtil_1.wrapRun(wrapContext, () => impl.run(args)));
+        return common_1.wrapRun(async () => {
+            const wrapContext = new wrapUtil_1.WrapDriverContext(context, ACTION_NAME, ACTION_NAME);
+            const impl = new ToolsInstallDriverImpl(wrapContext);
+            return await impl.run(args);
+        });
     }
-    async execute(args, context) {
+    async execute(args, context, outputEnvVarNames) {
         const wrapContext = new wrapUtil_1.WrapDriverContext(context, ACTION_NAME, ACTION_NAME);
-        const impl = new ToolsInstallDriverImpl(wrapContext);
-        return (await wrapUtil_1.wrapRun(wrapContext, () => impl.run(args), true));
+        const result = await common_1.wrapRun(async () => {
+            const impl = new ToolsInstallDriverImpl(wrapContext);
+            return await impl.run(args, outputEnvVarNames);
+        });
+        return {
+            result: result,
+            summaries: wrapContext.summaries,
+        };
     }
 };
+tslib_1.__decorate([
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, ACTION_NAME),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.prerequisite.progressBar")),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ToolsInstallDriver.prototype, "run", null);
+tslib_1.__decorate([
+    lib_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, ACTION_NAME),
+        updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.prerequisite.progressBar")),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
+    tslib_1.__metadata("design:returntype", Promise)
+], ToolsInstallDriver.prototype, "execute", null);
 ToolsInstallDriver = tslib_1.__decorate([
     typedi_1.Service(ACTION_NAME)
 ], ToolsInstallDriver);
@@ -44,36 +75,38 @@ class ToolsInstallDriverImpl {
     constructor(context) {
         this.context = context;
     }
-    async run(args) {
+    async run(args, outputEnvVarNames) {
         const res = new Map();
         this.validateArgs(args);
         this.setArgTelemetry(args);
-        const progressBar = await this.createProgressBar(this.getSteps(args));
         if (args.devCert) {
-            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(constant_1.ProgressMessages.devCert()));
-            const localCertRes = await this.resolveLocalCertificate(args.devCert.trust);
+            const localCertRes = await this.resolveLocalCertificate(args.devCert.trust, outputEnvVarNames);
             localCertRes.forEach((v, k) => res.set(k, v));
         }
         if (args.func) {
-            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(constant_1.ProgressMessages.func()));
-            const funcRes = await this.resolveFuncCoreTools();
+            const funcRes = await this.resolveFuncCoreTools(outputEnvVarNames);
             funcRes.forEach((v, k) => res.set(k, v));
         }
         if (args.dotnet) {
-            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(constant_1.ProgressMessages.dotnet()));
-            const dotnetRes = await this.resolveDotnet();
+            const dotnetRes = await this.resolveDotnet(outputEnvVarNames);
             dotnetRes.forEach((v, k) => res.set(k, v));
         }
         return res;
     }
-    async resolveLocalCertificate(trustDevCert) {
+    async resolveLocalCertificate(trustDevCert, outputEnvVarNames) {
         const res = new Map();
         // Do not print any log in LocalCertificateManager, use the error message returned instead.
         const certManager = new localCertificateManager_1.LocalCertificateManager(this.context.ui);
         const localCertResult = await certManager.setupCertificate(trustDevCert);
         if (trustDevCert) {
-            res.set(outputName.SSL_CRT_FILE, localCertResult.certPath);
-            res.set(outputName.SSL_KEY_FILE, localCertResult.keyPath);
+            let name = outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.sslCertFile);
+            if (name) {
+                res.set(name, localCertResult.certPath);
+            }
+            name = outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.sslKeyFile);
+            if (name) {
+                res.set(name, localCertResult.keyPath);
+            }
         }
         this.setDevCertTelemetry(trustDevCert, localCertResult);
         if (typeof localCertResult.isTrusted === "undefined") {
@@ -88,7 +121,7 @@ class ToolsInstallDriverImpl {
         }
         return res;
     }
-    async resolveFuncCoreTools() {
+    async resolveFuncCoreTools(outputEnvVarNames) {
         var _a, _b, _c, _d;
         const res = new Map();
         const depsManager = new deps_checker_1.DepsManager(new deps_checker_1.EmptyLogger(), new deps_checker_1.EmptyTelemetry());
@@ -106,11 +139,14 @@ class ToolsInstallDriverImpl {
         }
         if (((_d = funcStatus === null || funcStatus === void 0 ? void 0 : funcStatus.details) === null || _d === void 0 ? void 0 : _d.binFolders) !== undefined) {
             const funcBinFolder = funcStatus.details.binFolders.join(path.delimiter);
-            res.set(outputName.FUNC_PATH, funcBinFolder);
+            const name = outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.funcPath);
+            if (name) {
+                res.set(name, funcBinFolder);
+            }
         }
         return res;
     }
-    async resolveDotnet() {
+    async resolveDotnet(outputEnvVarNames) {
         var _a, _b, _c, _d;
         const res = new Map();
         const depsManager = new deps_checker_1.DepsManager(new deps_checker_1.EmptyLogger(), new deps_checker_1.EmptyTelemetry());
@@ -130,25 +166,25 @@ class ToolsInstallDriverImpl {
             const dotnetBinFolder = `${dotnetStatus.details.binFolders
                 .map((f) => path.dirname(f))
                 .join(path.delimiter)}`;
-            res.set(outputName.DOTNET_PATH, dotnetBinFolder);
+            const name = outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.dotnetPath);
+            if (name) {
+                res.set(name, dotnetBinFolder);
+            }
         }
         return res;
     }
     validateArgs(args) {
         var _a;
         if (!!args.devCert && typeof ((_a = args.devCert) === null || _a === void 0 ? void 0 : _a.trust) !== "boolean") {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(ACTION_NAME, "devCert.trust", helpLink);
+            throw new common_2.InvalidActionInputError(ACTION_NAME, ["devCert.trust"], helpLink);
         }
         if (!!args.func && typeof args.func !== "boolean") {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(ACTION_NAME, "func", helpLink);
+            throw new common_2.InvalidActionInputError(ACTION_NAME, ["func"], helpLink);
         }
         if (!!args.dotnet && typeof args.dotnet !== "boolean") {
-            throw new invalidParameterUserError_1.InvalidParameterUserError(ACTION_NAME, "dotnet", helpLink);
+            throw new common_2.InvalidActionInputError(ACTION_NAME, ["dotnet"], helpLink);
         }
     }
-    getSteps(args) {
-        return (args.devCert ? 1 : 0) + (args.dotnet ? 1 : 0) + (args.func ? 1 : 0);
-    }
     setArgTelemetry(args) {
         this.context.addTelemetryProperties({
             [constant_1.TelemetryProperties.driverArgs]: JSON.stringify({
@@ -178,15 +214,6 @@ class ToolsInstallDriverImpl {
                 : constant_1.TelemetryDepsCheckStatus.failed,
         });
     }
-    async createProgressBar(steps) {
-        var _a;
-        const progressBar = (_a = this.context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(constant_1.ProgressMessages.title(), steps);
-        if (progressBar) {
-            this.context.progressBars.push(progressBar);
-        }
-        await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.start());
-        return progressBar;
-    }
 }
 exports.ToolsInstallDriverImpl = ToolsInstallDriverImpl;
 //# sourceMappingURL=installDriver.js.map

package/build/component/driver/prerequisite/installDriver.js.map

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

package/build/component/driver/script/baseBuildDriver.d.ts

@@ -1,11 +1,13 @@
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 import { BuildArgs } from "../interface/buildAndDeployArgs";
 import { IProgressHandler, LogProvider, TelemetryReporter } from "@microsoft/teamsfx-api";
 import { DriverContext } from "../interface/commonArgs";
+import { ExecutionResult } from "../interface/stepDriver";
 export declare abstract class BaseBuildDriver {
     args: BuildArgs;
-    progressBarName: string;
-    progressBarSteps: number;
-    workingDirectory?: string;
+    workingDirectory: string;
     execPath?: string;
     protected context: DriverContext;
     protected logProvider: LogProvider;
@@ -16,12 +18,7 @@ export declare abstract class BaseBuildDriver {
     constructor(args: unknown, context: DriverContext, helpLink?: string);
     protected static asBuildArgs: (data: unknown, helpLink?: string | undefined) => BuildArgs;
     protected static toBuildArgs(args: unknown, helpLink?: string): BuildArgs;
-    run(): Promise<Map<string, string>>;
+    run(): Promise<ExecutionResult>;
     getCommand(): string;
-    /**
-     * call when error happens
-     * do some resource clean up
-     */
-    cleanup(): Promise<void>;
 }
 //# sourceMappingURL=baseBuildDriver.d.ts.map

package/build/component/driver/script/baseBuildDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAK5D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,8BAAsB,eAAe;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,SAAK;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC/C,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM;IAcpE,SAAS,CAAC,MAAM,CAAC,WAAW,8DAIzB;IAEH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAInE,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA2BzC,UAAU,IAAI,MAAM;IAKpB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
+{"version":3,"file":"baseBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAAW,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI1D,8BAAsB,eAAe;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC/C,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM;IAcpE,SAAS,CAAC,MAAM,CAAC,WAAW,8DAIzB;IAEH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAInE,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IA8BrC,UAAU,IAAI,MAAM;CAIrB"}

package/build/component/driver/script/baseBuildDriver.js

@@ -1,66 +1,63 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseBuildDriver = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("../../utils/common");
 const utils_1 = require("../../code/utils");
-const componentError_1 = require("../../error/componentError");
-const deployConstant_1 = require("../../constant/deployConstant");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const path = tslib_1.__importStar(require("path"));
+const localizeUtils_1 = require("../../../common/localizeUtils");
+const messages_1 = require("../../messages");
 class BaseBuildDriver {
     constructor(args, context, helpLink) {
         var _a;
-        this.progressBarSteps = 1;
         this.args = BaseBuildDriver.toBuildArgs(args, helpLink);
         this.args.workingDirectory = (_a = this.args.workingDirectory) !== null && _a !== void 0 ? _a : "./";
         // if working dir is not absolute path, then join the path with project path
         this.workingDirectory = path.isAbsolute(this.args.workingDirectory)
             ? this.args.workingDirectory
             : path.join(context.projectPath, this.args.workingDirectory);
-        this.progressBarName = `Building project ${this.workingDirectory}`;
         this.logProvider = context.logProvider;
         this.telemetryReporter = context.telemetryReporter;
         this.context = context;
+        this.progressBar = context.progressBar;
         this.execPath = this.args.execPath;
     }
     static toBuildArgs(args, helpLink) {
         return BaseBuildDriver.asBuildArgs(args, helpLink);
     }
     async run() {
-        var _a, _b, _c, _d, _e;
-        this.progressBar = (_a = this.context.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(this.progressBarName, this.progressBarSteps);
+        var _a;
         const command = this.getCommand();
-        await ((_b = this.progressBar) === null || _b === void 0 ? void 0 : _b.start());
         // add path to env if execPath is set
         let env = undefined;
         if (this.execPath) {
             env = { PATH: `${this.execPath}${path.delimiter}${process.env.PATH}` };
         }
-        await ((_c = this.progressBar) === null || _c === void 0 ? void 0 : _c.next(`Run command ${command} at ${this.workingDirectory}`));
-        try {
-            const output = await utils_1.execute(command, this.workingDirectory, this.logProvider, env);
-            await this.logProvider.debug(`execute ${command} output is ${output}`);
-            await ((_d = this.progressBar) === null || _d === void 0 ? void 0 : _d.end(true));
-        }
-        catch (e) {
-            throw componentError_1.ExecuteCommandError.fromErrorOutput(deployConstant_1.DeployConstant.DEPLOY_ERROR_TYPE, [command, (_e = this.workingDirectory) !== null && _e !== void 0 ? _e : ""], e);
+        await ((_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.runCommand(command, this.workingDirectory)));
+        const res = await utils_1.executeCommand(command, this.context.projectPath, this.logProvider, this.context.ui, this.workingDirectory, env);
+        if (res.isErr()) {
+            return {
+                result: teamsfx_api_1.err(res.error),
+                summaries: [],
+            };
         }
-        return BaseBuildDriver.emptyMap;
+        return {
+            result: teamsfx_api_1.ok(BaseBuildDriver.emptyMap),
+            summaries: [
+                localizeUtils_1.getLocalizedString("driver.script.runCommandSummary", command, this.workingDirectory),
+            ],
+        };
     }
     getCommand() {
         const commandSuffix = common_1.checkMissingArgs("BuildCommand", this.args.args).trim();
         return `${this.buildPrefix} ${commandSuffix}`;
     }
-    /**
-     * call when error happens
-     * do some resource clean up
-     */
-    async cleanup() {
-        var _a;
-        await ((_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.end(false));
-    }
 }
 exports.BaseBuildDriver = BaseBuildDriver;
 BaseBuildDriver.emptyMap = new Map();

package/build/component/driver/script/baseBuildDriver.js.map

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

package/build/component/driver/script/baseBuildStepDriver.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 import { ExecutionResult, StepDriver } from "../interface/stepDriver";
 import { DriverContext } from "../interface/commonArgs";
 import { FxError, Result } from "@microsoft/teamsfx-api";

package/build/component/driver/script/baseBuildStepDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseBuildStepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,8BAAsB,mBAAoB,YAAW,UAAU;IACvD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQ/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAOpE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;CACzE"}
+{"version":3,"file":"baseBuildStepDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,8BAAsB,mBAAoB,YAAW,UAAU;IACvD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK/F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAKpE,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;CACzE"}

package/build/component/driver/script/baseBuildStepDriver.js

@@ -1,20 +1,19 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseBuildStepDriver = void 0;
-const common_1 = require("../../utils/common");
 class BaseBuildStepDriver {
     async run(args, context) {
         const impl = this.getImpl(args, context);
-        return common_1.wrapRun(() => impl.run(), () => impl.cleanup());
+        return (await impl.run()).result;
     }
     execute(args, ctx) {
-        var _a, _b;
         const impl = this.getImpl(args, ctx);
-        return common_1.wrapSummaryWithArgs(this.run.bind(this, args, ctx), [
-            ["driver.script.buildSummary", (_a = impl.getCommand()) !== null && _a !== void 0 ? _a : "", (_b = impl.workingDirectory) !== null && _b !== void 0 ? _b : ""],
-        ]);
+        return impl.run();
     }
 }
 exports.BaseBuildStepDriver = BaseBuildStepDriver;

package/build/component/driver/script/baseBuildStepDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseBuildStepDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,+CAAkE;AAElE,MAAsB,mBAAmB;IACvC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,gBAAO,CACZ,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAChB,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CACrB,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,GAAkB;;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,4BAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE;YACzD,CAAC,4BAA4B,EAAE,MAAA,IAAI,CAAC,UAAU,EAAE,mCAAI,EAAE,EAAE,MAAA,IAAI,CAAC,gBAAgB,mCAAI,EAAE,CAAC;SACrF,CAAC,CAAC;IACL,CAAC;CAGF;AAjBD,kDAiBC"}
+{"version":3,"file":"baseBuildStepDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildStepDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;AAOH,MAAsB,mBAAmB;IACvC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;IACnC,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;CAGF;AAZD,kDAYC"}

package/build/component/driver/script/dotnetBuildDriver.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 import { BaseBuildDriver } from "./baseBuildDriver";
 import { DriverContext } from "../interface/commonArgs";
 import { FxError, Result } from "@microsoft/teamsfx-api";
@@ -8,8 +11,6 @@ export declare class DotnetBuildDriver extends BaseBuildStepDriver {
     run(args: unknown, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
 }
 export declare class DotnetBuildDriverImpl extends BaseBuildDriver {
-    progressBarName: string;
-    progressBarSteps: number;
     buildPrefix: string;
 }
 //# sourceMappingURL=dotnetBuildDriver.d.ts.map

package/build/component/driver/script/dotnetBuildDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dotnetBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/dotnetBuildDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,qBACa,iBAAkB,SAAQ,mBAAmB;IACxD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAyD;IAErF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;IASzD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAGhG;AAED,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,eAAe,SAAyD;IACxE,gBAAgB,SAAK;IACrB,WAAW,SAAY;CACxB"}
+{"version":3,"file":"dotnetBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/dotnetBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,qBACa,iBAAkB,SAAQ,mBAAmB;IACxD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAyD;IAErF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;IASzD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAGhG;AAED,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,WAAW,SAAY;CACxB"}

package/build/component/driver/script/dotnetBuildDriver.js

@@ -1,6 +1,9 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DotnetBuildDriverImpl = exports.DotnetBuildDriver = void 0;
 const tslib_1 = require("tslib");
@@ -25,7 +28,7 @@ let DotnetBuildDriver = class DotnetBuildDriver extends baseBuildStepDriver_1.Ba
     }
 };
 tslib_1.__decorate([
-    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.DEPLOY_COMPONENT_NAME)]),
+    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
@@ -37,8 +40,6 @@ exports.DotnetBuildDriver = DotnetBuildDriver;
 class DotnetBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {
     constructor() {
         super(...arguments);
-        this.progressBarName = `Building Dotnet project at ${this.workingDirectory}`;
-        this.progressBarSteps = 1;
         this.buildPrefix = "dotnet";
     }
 }

package/build/component/driver/script/dotnetBuildDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"dotnetBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/dotnetBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAEnE,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAG3C,IAAa,iBAAiB,GAA9B,MAAa,iBAAkB,SAAQ,yCAAmB;IAA1D;;QACW,gBAAW,GAAW,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;IAcvF,CAAC;IAZC,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,qBAAqB,CAC9B,IAAI,EACJ,OAAO,EACP,uDAAuD,CACxD,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;4CAGtF;AAdU,iBAAiB;IAD7B,gBAAO,CAAC,WAAW,CAAC;GACR,iBAAiB,CAe7B;AAfY,8CAAiB;AAiB9B,MAAa,qBAAsB,SAAQ,iCAAe;IAA1D;;QACE,oBAAe,GAAG,8BAA8B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxE,qBAAgB,GAAG,CAAC,CAAC;QACrB,gBAAW,GAAG,QAAQ,CAAC;IACzB,CAAC;CAAA;AAJD,sDAIC"}
+{"version":3,"file":"dotnetBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/dotnetBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAEnE,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAG3C,IAAa,iBAAiB,GAA9B,MAAa,iBAAkB,SAAQ,yCAAmB;IAA1D;;QACW,gBAAW,GAAW,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;IAcvF,CAAC;IAZC,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,qBAAqB,CAC9B,IAAI,EACJ,OAAO,EACP,uDAAuD,CACxD,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;4CAGjF;AAdU,iBAAiB;IAD7B,gBAAO,CAAC,WAAW,CAAC;GACR,iBAAiB,CAe7B;AAfY,8CAAiB;AAiB9B,MAAa,qBAAsB,SAAQ,iCAAe;IAA1D;;QACE,gBAAW,GAAG,QAAQ,CAAC;IACzB,CAAC;CAAA;AAFD,sDAEC"}

package/build/component/driver/script/npmBuildDriver.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 import { BaseBuildDriver } from "./baseBuildDriver";
 import { DriverContext } from "../interface/commonArgs";
 import { FxError, Result } from "@microsoft/teamsfx-api";

package/build/component/driver/script/npmBuildDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npmBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/npmBuildDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,qBACa,cAAe,SAAQ,mBAAmB;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAsD;IAElF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;IASzD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAGhG;AAED,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,WAAW,SAAS;CACrB"}
+{"version":3,"file":"npmBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/npmBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,qBACa,cAAe,SAAQ,mBAAmB;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAsD;IAElF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,eAAe;IASzD,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAGhG;AAED,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,WAAW,SAAS;CACrB"}

package/build/component/driver/script/npmBuildDriver.js

@@ -1,6 +1,9 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+/**
+ * @owner fanhu <fanhu@microsoft.com>
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NpmBuildDriverImpl = exports.NpmBuildDriver = void 0;
 const tslib_1 = require("tslib");
@@ -25,7 +28,7 @@ let NpmBuildDriver = class NpmBuildDriver extends baseBuildStepDriver_1.BaseBuil
     }
 };
 tslib_1.__decorate([
-    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.DEPLOY_COMPONENT_NAME)]),
+    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)

package/build/component/driver/script/npmBuildDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"npmBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npmBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAEnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;IAcpF,CAAC;IAZC,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,kBAAkB,CAC3B,IAAI,EACJ,OAAO,EACP,oDAAoD,CACrD,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;yCAGtF;AAdU,cAAc;IAD1B,gBAAO,CAAC,WAAW,CAAC;GACR,cAAc,CAe1B;AAfY,wCAAc;AAiB3B,MAAa,kBAAmB,SAAQ,iCAAe;IAAvD;;QACE,gBAAW,GAAG,KAAK,CAAC;IACtB,CAAC;CAAA;AAFD,gDAEC"}
+{"version":3,"file":"npmBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npmBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAEnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;IAcpF,CAAC;IAZC,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,kBAAkB,CAC3B,IAAI,EACJ,OAAO,EACP,oDAAoD,CACrD,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;yCAGjF;AAdU,cAAc;IAD1B,gBAAO,CAAC,WAAW,CAAC;GACR,cAAc,CAe1B;AAfY,wCAAc;AAiB3B,MAAa,kBAAmB,SAAQ,iCAAe;IAAvD;;QACE,gBAAW,GAAG,KAAK,CAAC;IACtB,CAAC;CAAA;AAFD,gDAEC"}

package/build/component/driver/script/npxBuildDriver.js

@@ -25,7 +25,7 @@ let NpxBuildDriver = class NpxBuildDriver extends baseBuildStepDriver_1.BaseBuil
     }
 };
 tslib_1.__decorate([
-    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.DEPLOY_COMPONENT_NAME)]),
+    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)

package/build/component/driver/script/npxBuildDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"npxBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npxBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAoD;AACpD,mCAAiC;AAGjC,+DAA4D;AAC5D,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,iEAAmE;AAEnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;IAcpF,CAAC;IAXC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,kBAAkB,CAC3B,IAAI,EACJ,OAAO,EACP,oDAAoD,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AAXC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;yCAGtF;AANU,cAAc;IAD1B,gBAAO,CAAC,WAAW,CAAC;GACR,cAAc,CAe1B;AAfY,wCAAc;AAiB3B,MAAa,kBAAmB,SAAQ,iCAAe;IAAvD;;QACE,gBAAW,GAAG,KAAK,CAAC;IACtB,CAAC;CAAA;AAFD,gDAEC"}
+{"version":3,"file":"npxBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npxBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAoD;AACpD,mCAAiC;AAGjC,+DAA4D;AAC5D,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,iEAAmE;AAEnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;IAcpF,CAAC;IAXC,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;QAC7C,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,kBAAkB,CAC3B,IAAI,EACJ,OAAO,EACP,oDAAoD,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AAXC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;yCAGjF;AANU,cAAc;IAD1B,gBAAO,CAAC,WAAW,CAAC;GACR,cAAc,CAe1B;AAfY,wCAAc;AAiB3B,MAAa,kBAAmB,SAAQ,iCAAe;IAAvD;;QACE,gBAAW,GAAG,KAAK,CAAC;IACtB,CAAC;CAAA;AAFD,gDAEC"}

package/build/component/driver/script/scriptDriver.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @author huajiezhang <huajiezhang@microsoft.com>
+ */
+import { FxError, Result } from "@microsoft/teamsfx-api";
+import { DriverContext } from "../interface/commonArgs";
+import { ExecutionResult, StepDriver } from "../interface/stepDriver";
+export declare class ScriptDriver implements StepDriver {
+    run(args: unknown, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
+    execute(args: unknown, ctx: DriverContext): Promise<ExecutionResult>;
+}
+export declare const scriptDriver: ScriptDriver;
+//# sourceMappingURL=scriptDriver.d.ts.map

package/build/component/driver/script/scriptDriver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAiBtE,qBACa,YAAa,YAAW,UAAU;IAEvC,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAuBzF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAO3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}