@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/build/component/driver/oauth/utility/utility.js

@@ -5,25 +5,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getandValidateOauthInfoFromSpec = void 0;
 const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 const common_1 = require("../../../utils/common");
+const featureFlags_1 = require("../../../../common/featureFlags");
 const lodash_1 = require("lodash");
 const constants_1 = require("./constants");
 const oauthDomainInvalid_1 = require("../error/oauthDomainInvalid");
 const oauthFailedToGetDomain_1 = require("../error/oauthFailedToGetDomain");
 const oauthAuthInfoInvalid_1 = require("../error/oauthAuthInfoInvalid");
 async function getandValidateOauthInfoFromSpec(args, context, actionName) {
-    const absolutePath = (0, common_1.getAbsolutePath)(args.apiSpecPath, context.projectPath);
+    const absolutePath = common_1.getAbsolutePath(args.apiSpecPath, context.projectPath);
     const parser = new m365_spec_parser_1.SpecParser(absolutePath, {
         allowAPIKeyAuth: false,
-        allowBearerTokenAuth: true,
+        allowBearerTokenAuth: featureFlags_1.isCopilotAuthEnabled(),
         allowMultipleParameters: true,
-        allowOauth2: true,
+        allowOauth2: featureFlags_1.isCopilotAuthEnabled(),
         projectType: m365_spec_parser_1.ProjectType.Copilot,
         allowMissingId: true,
         allowSwagger: true,
         allowMethods: ["get", "post", "put", "delete", "patch", "head", "connect", "options", "trace"],
     });
     const listResult = await parser.list();
-    const operations = listResult.APIs.filter((value) => {
+    const operations = listResult.APIs.filter((value) => value.isValid).filter((value) => {
         const auth = value.auth;
         return auth && auth.authScheme.type === "oauth2" && auth.name === args.name;
     });
@@ -54,7 +55,7 @@ async function getandValidateOauthInfoFromSpec(args, context, actionName) {
             };
         })
             .reduce((accumulator, currentValue) => {
-            if (!accumulator.find((item) => (0, lodash_1.isEqual)(item, currentValue))) {
+            if (!accumulator.find((item) => lodash_1.isEqual(item, currentValue))) {
                 accumulator.push(currentValue);
             }
             return accumulator;

package/build/component/driver/oauth/utility/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kEAAsE;AACtE,kDAAwD;AAKxD,mCAAiC;AACjC,2CAAgD;AAChD,oEAAsE;AACtE,4EAA8E;AAC9E,wEAAqE;AAkB9D,KAAK,UAAU,+BAA+B,CACnD,IAAuC,EACvC,OAAsB,EACtB,UAAkB;IAElB,MAAM,YAAY,GAAG,IAAA,wBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,6BAAU,CAAC,YAAY,EAAE;QAC1C,eAAe,EAAE,KAAK;QACtB,oBAAoB,EAAE,IAAI;QAC1B,uBAAuB,EAAE,IAAI;QAC7B,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,8BAAW,CAAC,OAAO;QAChC,cAAc,EAAE,IAAI;QACpB,YAAY,EAAE,IAAI;QAClB,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC;KAC/F,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,UAAU;SACvB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;IACvC,CAAC,CAAC,CAAC;IACL,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpC,IAAI,MAAM,IAAI,IAAI,EAAE;QAClB,MAAM,aAAa,GAAG,UAAU;aAC7B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;YACb,IAAI,QAAQ,CAAC;YACb,QAAQ,IAAI,CAAC,IAAI,EAAE;gBACjB,KAAK,mBAAmB,CAAC;gBACzB;oBACE,QAAQ,GAAG,CAAC,MAAA,KAAK,CAAC,IAAI,0CAAE,UAA6C,CAAA,CAAC,KAAK;yBACxE,iBAAiB,CAAC;aACxB;YACD,OAAO;gBACL,gBAAgB,EAAE,QAAS,CAAC,gBAAgB;gBAC5C,QAAQ,EAAE,QAAS,CAAC,QAAQ;gBAC5B,UAAU,EAAE,QAAS,CAAC,UAAU;gBAChC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,QAAS,CAAC,MAAM,CAAC;aACtC,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,WAAuB,EAAE,YAAY,EAAE,EAAE;YAChD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,gBAAO,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE;gBAC5D,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aAChC;YACD,OAAO,WAAW,CAAC;QACrB,CAAC,EAAE,EAAE,CAAC,CAAC;QAET,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,MAAM,IAAI,2CAAoB,CAAC,UAAU,CAAC,CAAC;SAC5C;QACD,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAClC,OAAO;YACL,MAAM,EAAE,OAAO;YACf,qBAAqB,EAAE,QAAQ,CAAC,gBAAgB;YAChD,qBAAqB,EAAE,QAAQ,CAAC,QAAQ;YACxC,oBAAoB,EAAE,QAAQ,CAAC,UAAU;YACzC,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC;KACH;SAAM;QACL,OAAO;YACL,MAAM,EAAE,OAAO;SAChB,CAAC;KACH;AACH,CAAC;AAvED,0EAuEC;AAED,SAAS,cAAc,CAAC,MAAgB,EAAE,UAAkB;IAC1D,IAAI,MAAM,CAAC,MAAM,GAAG,6BAAiB,EAAE;QACrC,MAAM,IAAI,4CAAuB,CAAC,UAAU,CAAC,CAAC;KAC/C;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,IAAI,oDAA2B,CAAC,UAAU,CAAC,CAAC;KACnD;AACH,CAAC"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":"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"}

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

@@ -41,30 +41,30 @@ class BaseBuildDriver {
             env = { PATH: `${this.execPath}${path.delimiter}${process.env.PATH}` };
         }
         await ((_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.runCommand(command, this.workingDirectory)));
-        const res = await (0, scriptDriver_1.executeCommand)(command, this.context.projectPath, this.logProvider, this.context.ui, this.workingDirectory, env);
+        const res = await scriptDriver_1.executeCommand(command, this.context.projectPath, this.logProvider, this.context.ui, this.workingDirectory, env);
         if (res.isErr()) {
             return {
-                result: (0, teamsfx_api_1.err)(res.error),
+                result: teamsfx_api_1.err(res.error),
                 summaries: [],
             };
         }
         return {
-            result: (0, teamsfx_api_1.ok)(BaseBuildDriver.emptyMap),
+            result: teamsfx_api_1.ok(BaseBuildDriver.emptyMap),
             summaries: [
-                (0, localizeUtils_1.getLocalizedString)("driver.script.runCommandSummary", command, this.workingDirectory),
+                localizeUtils_1.getLocalizedString("driver.script.runCommandSummary", command, this.workingDirectory),
             ],
         };
     }
     getCommand() {
-        const commandSuffix = (0, common_1.checkMissingArgs)("BuildCommand", this.args.args).trim();
+        const commandSuffix = common_1.checkMissingArgs("BuildCommand", this.args.args).trim();
         return `${this.buildPrefix} ${commandSuffix}`;
     }
 }
 exports.BaseBuildDriver = BaseBuildDriver;
 BaseBuildDriver.emptyMap = new Map();
-BaseBuildDriver.asBuildArgs = (0, common_1.asFactory)({
-    workingDirectory: (0, common_1.asOptional)(common_1.asString),
+BaseBuildDriver.asBuildArgs = common_1.asFactory({
+    workingDirectory: common_1.asOptional(common_1.asString),
     args: common_1.asString,
-    execPath: (0, common_1.asOptional)(common_1.asString),
+    execPath: common_1.asOptional(common_1.asString),
 });
 //# sourceMappingURL=baseBuildDriver.js.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":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAGH,+CAAuF;AACvF,wDAAmG;AAEnG,mDAA6B;AAE7B,iEAAmE;AACnE,6CAAkD;AAClD,iDAAgD;AAEhD,MAAsB,eAAe;IAWnC,YAAY,IAAa,EAAE,OAAsB,EAAE,QAAiB;;QAClE,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,gBAAgB,mCAAI,IAAI,CAAC;QAChE,4EAA4E;QAC5E,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACjE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IACrC,CAAC;IAQS,MAAM,CAAC,WAAW,CAAC,IAAa,EAAE,QAAiB;QAC3D,OAAO,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG;;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,qCAAqC;QACrC,IAAI,GAAG,GAAkC,SAAS,CAAC;QACnD,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,4EAA4E;YAC5E,GAAG,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;SACxE;QACD,MAAM,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAC,2BAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA,CAAC;QAC1F,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAc,EAC9B,OAAO,EACP,IAAI,CAAC,OAAO,CAAC,WAAW,EACxB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,OAAO,CAAC,EAAE,EACf,IAAI,CAAC,gBAAgB,EACrB,GAAG,CACJ,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,OAAO;gBACL,MAAM,EAAE,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC;gBACtB,SAAS,EAAE,EAAE;aACd,CAAC;SACH;QACD,OAAO;YACL,MAAM,EAAE,IAAA,gBAAE,EAAC,eAAe,CAAC,QAAQ,CAAC;YACpC,SAAS,EAAE;gBACT,IAAA,kCAAkB,EAAC,iCAAiC,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC;aACtF;SACF,CAAC;IACJ,CAAC;IAED,UAAU;QACR,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9E,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,aAAa,EAAE,CAAC;IAChD,CAAC;;AArEH,0CAsEC;AA9DiB,wBAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;AAiBpC,2BAAW,GAAG,IAAA,kBAAS,EAAY;IAClD,gBAAgB,EAAE,IAAA,mBAAU,EAAC,iBAAQ,CAAC;IACtC,IAAI,EAAE,iBAAQ;IACd,QAAQ,EAAE,IAAA,mBAAU,EAAC,iBAAQ,CAAC;CAC/B,CAAC,CAAC"}
+{"version":3,"file":"baseBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"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"}

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

@@ -18,7 +18,7 @@ const ACTION_NAME = "cli/runDotnetCommand";
 let DotnetBuildDriver = class DotnetBuildDriver extends baseBuildStepDriver_1.BaseBuildStepDriver {
     constructor() {
         super(...arguments);
-        this.description = (0, localizeUtils_1.getLocalizedString)("driver.script.dotnetDescription");
+        this.description = localizeUtils_1.getLocalizedString("driver.script.dotnetDescription");
     }
     getImpl(args, context) {
         return new DotnetBuildDriverImpl(args, context, "https://aka.ms/teamsfx-actions/cli-run-dotnet-command");
@@ -28,13 +28,13 @@ let DotnetBuildDriver = class DotnetBuildDriver extends baseBuildStepDriver_1.Ba
     }
 };
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
+    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)
 ], DotnetBuildDriver.prototype, "execute", null);
 DotnetBuildDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(ACTION_NAME)
+    typedi_1.Service(ACTION_NAME)
 ], DotnetBuildDriver);
 exports.DotnetBuildDriver = DotnetBuildDriver;
 class DotnetBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {

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;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAGnE,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAG3C,IAAa,iBAAiB,GAA9B,MAAa,iBAAkB,SAAQ,yCAAmB;IAA1D;;QACW,gBAAW,GAAW,IAAA,kCAAkB,EAAC,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,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,IAAA,aAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;gDAGjF;AAdU,iBAAiB;IAD7B,IAAA,gBAAO,EAAC,WAAW,CAAC;GACR,iBAAiB,CAe7B;AAfY,8CAAiB;AAiB9B,MAAa,qBAAsB,SAAQ,iCAAe;IAA1D;;QACE,gBAAW,GAAG,QAAQ,CAAC;IACzB,CAAC;CAAA;AAFD,sDAEC"}
+{"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;AAGnE,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,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;gDAGjF;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.js

@@ -18,7 +18,7 @@ const ACTION_NAME = "cli/runNpmCommand";
 let NpmBuildDriver = class NpmBuildDriver extends baseBuildStepDriver_1.BaseBuildStepDriver {
     constructor() {
         super(...arguments);
-        this.description = (0, localizeUtils_1.getLocalizedString)("driver.script.npmDescription");
+        this.description = localizeUtils_1.getLocalizedString("driver.script.npmDescription");
     }
     getImpl(args, context) {
         return new NpmBuildDriverImpl(args, context, "https://aka.ms/teamsfx-actions/cli-run-npm-command");
@@ -28,13 +28,13 @@ let NpmBuildDriver = class NpmBuildDriver extends baseBuildStepDriver_1.BaseBuil
     }
 };
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
+    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)
 ], NpmBuildDriver.prototype, "execute", null);
 NpmBuildDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(ACTION_NAME)
+    typedi_1.Service(ACTION_NAME)
 ], NpmBuildDriver);
 exports.NpmBuildDriver = NpmBuildDriver;
 class NpmBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {

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;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAGnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,IAAA,kCAAkB,EAAC,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,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,IAAA,aAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;6CAGjF;AAdU,cAAc;IAD1B,IAAA,gBAAO,EAAC,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;AAGnE,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,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAHC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;6CAGjF;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

@@ -16,7 +16,7 @@ const ACTION_NAME = "cli/runNpxCommand";
 let NpxBuildDriver = class NpxBuildDriver extends baseBuildStepDriver_1.BaseBuildStepDriver {
     constructor() {
         super(...arguments);
-        this.description = (0, localizeUtils_1.getLocalizedString)("driver.script.npxDescription");
+        this.description = localizeUtils_1.getLocalizedString("driver.script.npxDescription");
     }
     execute(args, ctx) {
         return super.execute(args, ctx);
@@ -26,16 +26,16 @@ let NpxBuildDriver = class NpxBuildDriver extends baseBuildStepDriver_1.BaseBuil
     }
 };
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT),
-        (0, addSWADeployTelemetry_1.addSWADeployTelemetry)(ACTION_NAME),
+    hooks_1.hooks([
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT),
+        addSWADeployTelemetry_1.addSWADeployTelemetry(ACTION_NAME),
     ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], NpxBuildDriver.prototype, "execute", null);
 NpxBuildDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(ACTION_NAME)
+    typedi_1.Service(ACTION_NAME)
 ], NpxBuildDriver);
 exports.NpxBuildDriver = NpxBuildDriver;
 class NpxBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {

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,+EAA4E;AAE5E,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,IAAA,kCAAkB,EAAC,8BAA8B,CAAC,CAAC;IAiBpF,CAAC;IAXC,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,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;IAJC,IAAA,aAAK,EAAC;QACL,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC;QACxE,IAAA,6CAAqB,EAAC,WAAW,CAAC;KACnC,CAAC;;;;6CAGD;AATU,cAAc;IAD1B,IAAA,gBAAO,EAAC,WAAW,CAAC;GACR,cAAc,CAkB1B;AAlBY,wCAAc;AAoB3B,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,+EAA4E;AAE5E,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGxC,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAmB;IAAvD;;QACW,gBAAW,GAAW,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;IAiBpF,CAAC;IAXC,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,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;IAJC,aAAK,CAAC;QACL,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC;QACxE,6CAAqB,CAAC,WAAW,CAAC;KACnC,CAAC;;;;6CAGD;AATU,cAAc;IAD1B,gBAAO,CAAC,WAAW,CAAC;GACR,cAAc,CAkB1B;AAlBY,wCAAc;AAoB3B,MAAa,kBAAmB,SAAQ,iCAAe;IAAvD;;QACE,gBAAW,GAAG,KAAK,CAAC;IACtB,CAAC;CAAA;AAFD,gDAEC"}

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

@@ -1,6 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { FxError, LogProvider, Result } from "@microsoft/teamsfx-api";
 import child_process from "child_process";
 import { ScriptExecutionError, ScriptTimeoutError } from "../../../error/script";

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

@@ -1 +1 @@
-{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAM1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAMtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CA0ElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAUlE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
+{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAM1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAMtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAsB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAsElD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}

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

@@ -17,6 +17,7 @@ const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
 const script_1 = require("../../../error/script");
 const commonConstant_1 = require("../../constant/commonConstant");
+const messages_1 = require("../../messages");
 const charsetUtils_1 = require("../../utils/charsetUtils");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
 const stringUtils_1 = require("../../../common/stringUtils");
@@ -50,43 +51,45 @@ async function defaultShell() {
 exports.defaultShell = defaultShell;
 let ScriptDriver = class ScriptDriver {
     async _run(typedArgs, context) {
-        var _a;
-        await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next("Running script"));
+        var _a, _b;
+        await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.runCommand(typedArgs.run, (_b = typedArgs.workingDirectory) !== null && _b !== void 0 ? _b : "./")));
         const res = await executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
         if (res.isErr())
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         const outputs = res.value[1];
         const kvArray = Object.keys(outputs).map((k) => [k, outputs[k]]);
-        return (0, teamsfx_api_1.ok)(new Map(kvArray));
+        return teamsfx_api_1.ok(new Map(kvArray));
     }
     async execute(args, ctx) {
         const typedArgs = args;
         const res = await this._run(typedArgs, ctx);
-        const summaries = res.isOk() ? [`Successfully executed command`] : [];
+        const summaries = res.isOk()
+            ? [`Successfully executed command ${stringUtils_1.maskSecretValues(args.run)}`]
+            : [];
         return { result: res, summaries: summaries };
     }
 };
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
+    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)
 ], ScriptDriver.prototype, "execute", null);
 ScriptDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(ACTION_NAME)
+    typedi_1.Service(ACTION_NAME)
 ], ScriptDriver);
 exports.ScriptDriver = ScriptDriver;
 exports.scriptDriver = new ScriptDriver();
 async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
-    const systemEncoding = await (0, charsetUtils_1.getSystemEncoding)(command);
+    const systemEncoding = await charsetUtils_1.getSystemEncoding();
     const dshell = await defaultShell();
     return new Promise((resolve) => {
         var _a, _b;
         const finalShell = shell || dshell;
-        const finalCmd = command;
-        // if (typeof finalShell === "string" && finalShell.includes("cmd")) {
-        //   finalCmd = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
-        // }
+        let finalCmd = command;
+        if (typeof finalShell === "string" && finalShell.includes("cmd")) {
+            finalCmd = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
+        }
         const platform = os_1.default.platform();
         let workingDir = workingDirectory || ".";
         workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
@@ -97,9 +100,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         if (redirectTo) {
             appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
         }
-        logProvider.verbose(`Start to run command: "${(0, stringUtils_1.maskSecret)(finalCmd, {
-            replace: "***",
-        })}" with args: ${JSON.stringify({
+        logProvider.verbose(`Start to run command: "${stringUtils_1.maskSecretValues(finalCmd)}" with args: ${JSON.stringify({
             shell: finalShell,
             cwd: workingDir,
             encoding: systemEncoding,
@@ -118,17 +119,15 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         }, (error) => {
             if (error) {
                 error.message = stderrStrings.join("").trim() || error.message;
-                resolve((0, teamsfx_api_1.err)(convertScriptErrorToFxError(error, finalCmd)));
+                resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, finalCmd)));
             }
             else {
                 // handle '::set-output' or '::set-teamsfx-env' pattern
                 const outputString = allOutputStrings.join("");
                 const outputObject = parseSetOutputCommand(outputString);
                 if (Object.keys(outputObject).length > 0)
-                    logProvider.verbose(`script output env variables: ${(0, stringUtils_1.maskSecret)(JSON.stringify(outputObject), {
-                        replace: "***",
-                    })}`);
-                resolve((0, teamsfx_api_1.ok)([outputString, outputObject]));
+                    logProvider.verbose(`script output env variables: ${stringUtils_1.maskSecretValues(JSON.stringify(outputObject))}`);
+                resolve(teamsfx_api_1.ok([outputString, outputObject]));
             }
         });
         const dataHandler = (data) => {
@@ -139,7 +138,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         };
         (_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
             const str = bufferToString(data, systemEncoding);
-            logProvider.info(` [script stdout] ${(0, stringUtils_1.maskSecret)(str, { replace: "***" })}`);
+            logProvider.info(` [script stdout] ${stringUtils_1.maskSecretValues(str)}`);
             dataHandler(str);
         });
         const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
@@ -150,7 +149,7 @@ exports.executeCommand = executeCommand;
 function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
     return (data) => {
         const str = bufferToString(data, systemEncoding);
-        logProvider.warning(` [script stderr] ${(0, stringUtils_1.maskSecret)(str, { replace: "***" })}`);
+        logProvider.warning(` [script stderr] ${stringUtils_1.maskSecretValues(str)}`);
         dataHandler(str);
         stderrStrings.push(str);
     };
@@ -165,21 +164,23 @@ function bufferToString(data, systemEncoding) {
 exports.bufferToString = bufferToString;
 function convertScriptErrorToFxError(error, run) {
     if (error.killed) {
-        return new script_1.ScriptTimeoutError(error, run);
+        return new script_1.ScriptTimeoutError(error);
     }
     else {
-        return new script_1.ScriptExecutionError(error, run);
+        return new script_1.ScriptExecutionError(error);
     }
 }
 exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
 function parseSetOutputCommand(stdout) {
-    const regex = /::(set-teamsfx-env|set-output)\s+(\w+)=((["'])(.*?)\4|[^"'\s]+)/g;
+    const regex = /(::set-teamsfx-env|::set-output)\s+([^"'\s]+)=([^"'\s]+)/g;
     const output = {};
     let match;
     while ((match = regex.exec(stdout))) {
-        const key = match[2];
-        const value = match[5] !== undefined ? match[5] : match[3];
-        output[key] = value;
+        if (match && match.length === 4) {
+            const key = match[2].trim();
+            const value = match[3].trim();
+            output[key] = value;
+        }
     }
     return output;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,6CAA0C;AAC1C,wDAA+E;AAC/E,0EAA0C;AAC1C,gEAA0B;AAC1B,oEAA+B;AAC/B,oDAAoB;AACpB,mDAA6B;AAC7B,mCAAiC;AACjC,kDAAiF;AACjF,kEAAkE;AAClE,2DAA6D;AAI7D,mFAAgF;AAChF,6DAAyD;AAEzD,MAAM,WAAW,GAAG,QAAQ,CAAC;AAU7B;;;;;;GAMG;AACI,KAAK,UAAU,YAAY;IAChC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;QACrB,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;KAC1B;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;QACjC,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO,UAAU,CAAC;aAClD,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,WAAW,CAAC;QAC9D,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS,CAAC;KACzC;IACD,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAClC,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAhBD,oCAgBC;AAGD,IAAa,YAAY,GAAzB,MAAa,YAAY;IACvB,KAAK,CAAC,IAAI,CACR,SAA2B,EAC3B,OAAsB;;QAEtB,MAAM,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,cAAc,CAC9B,SAAS,CAAC,GAAG,EACb,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,EACV,SAAS,CAAC,gBAAgB,EAC1B,SAAS,EACT,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,OAAO,EACjB,SAAS,CAAC,UAAU,CACrB,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAuB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,OAAO,IAAA,gBAAE,EAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9B,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,SAAS,GAAG,IAAwB,CAAC;QAC3C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAa,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAC/C,CAAC;CACF,CAAA;AANC;IADC,IAAA,aAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;2CAMjF;AA7BU,YAAY;IADxB,IAAA,gBAAO,EAAC,WAAW,CAAC;GACR,YAAY,CA8BxB;AA9BY,oCAAY;AAgCZ,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;AAExC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,WAAmB,EACnB,WAAwB,EACxB,EAAuB,EACvB,gBAAyB,EACzB,GAAuB,EACvB,KAAc,EACd,OAAgB,EAChB,UAAmB;IAEnB,MAAM,cAAc,GAAG,MAAM,IAAA,gCAAiB,EAAC,OAAO,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;QAC7B,MAAM,UAAU,GAAG,KAAK,IAAI,MAAM,CAAC;QACnC,MAAM,QAAQ,GAAG,OAAO,CAAC;QACzB,sEAAsE;QACtE,oEAAoE;QACpE,IAAI;QACJ,MAAM,QAAQ,GAAG,YAAE,CAAC,QAAQ,EAAE,CAAC;QAC/B,IAAI,UAAU,GAAG,gBAAgB,IAAI,GAAG,CAAC;QACzC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC3F,IAAI,QAAQ,KAAK,OAAO,EAAE;YACxB,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC,CAAC;SACpE;QACD,IAAI,UAAU,GAAuB,SAAS,CAAC;QAC/C,IAAI,UAAU,EAAE;YACd,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;SAC5F;QACD,WAAW,CAAC,OAAO,CACjB,0BAA0B,IAAA,wBAAU,EAAC,QAAQ,EAAE;YAC7C,OAAO,EAAE,KAAK;SACf,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC;YAC/B,KAAK,EAAE,UAAU;YACjB,GAAG,EAAE,UAAU;YACf,QAAQ,EAAE,cAAc;YACxB,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,GAAG,CAAE;YAC/B,OAAO,EAAE,OAAO;SACjB,CAAC,GAAG,CACN,CAAC;QACF,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,yGAAyG;QACzI,MAAM,EAAE,GAAG,uBAAa,CAAC,IAAI,CAC3B,QAAQ,EACR;YACE,KAAK,EAAE,UAAU;YACjB,GAAG,EAAE,UAAU;YACf,QAAQ,EAAE,QAAQ;YAClB,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,GAAG,CAAE;YAC/B,OAAO,EAAE,OAAO;SACjB,EACD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK,EAAE;gBACT,KAAK,CAAC,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC;gBAC/D,OAAO,CAAC,IAAA,iBAAG,EAAC,2BAA2B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;aAC5D;iBAAM;gBACL,uDAAuD;gBACvD,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/C,MAAM,YAAY,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;gBACzD,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC;oBACtC,WAAW,CAAC,OAAO,CACjB,gCAAgC,IAAA,wBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;wBACvE,OAAO,EAAE,KAAK;qBACf,CAAC,EAAE,CACL,CAAC;gBACJ,OAAO,CAAC,IAAA,gBAAE,EAAC,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CACF,CAAC;QACF,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE;YACnC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,UAAU,EAAE;gBACd,kBAAE,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;aACrC;QACH,CAAC,CAAC;QACF,MAAA,EAAE,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACjD,WAAW,CAAC,IAAI,CAAC,oBAAoB,IAAA,wBAAU,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5E,WAAW,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAC1F,MAAA,EAAE,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC;AApFD,wCAoFC;AAED,SAAgB,gBAAgB,CAC9B,WAAwB,EACxB,cAAsB,EACtB,aAAuB,EACvB,WAAmC;IAEnC,OAAO,CAAC,IAAY,EAAE,EAAE;QACtB,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACjD,WAAW,CAAC,OAAO,CAAC,oBAAoB,IAAA,wBAAU,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/E,WAAW,CAAC,GAAG,CAAC,CAAC;QACjB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC;AAZD,4CAYC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,cAAsB;IACjE,MAAM,GAAG,GACP,cAAc,KAAK,MAAM,IAAI,cAAc,KAAK,OAAO;QACrD,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;QACjB,CAAC,CAAC,oBAAK,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzC,OAAO,GAAG,CAAC;AACb,CAAC;AAND,wCAMC;AAED,SAAgB,2BAA2B,CACzC,KAAkC,EAClC,GAAW;IAEX,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,OAAO,IAAI,2BAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,IAAI,6BAAoB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KAC7C;AACH,CAAC;AATD,kEASC;AAED,SAAgB,qBAAqB,CAAC,MAAc;IAClD,MAAM,KAAK,GAAG,kEAAkE,CAAC;IACjF,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE;QACnC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KACrB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAVD,sDAUC;AAED,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAFD,sDAEC"}
+{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}

package/build/component/driver/teamsApp/appStudio.d.ts

@@ -1,4 +1,4 @@
-import { Context, FxError, InputsWithProjectPath, LogProvider, M365TokenProvider, Result } from "@microsoft/teamsfx-api";
+import { FxError, InputsWithProjectPath, M365TokenProvider, Result, LogProvider, Context } from "@microsoft/teamsfx-api";
 import { AppPackage } from "./interfaces/appdefinitions/appPackage";
 export declare function checkIfAppInDifferentAcountSameTenant(teamsAppId: string, tokenProvider: M365TokenProvider, logger: LogProvider): Promise<Result<boolean, FxError>>;
 export declare function updateManifestV3(ctx: Context, inputs: InputsWithProjectPath): Promise<Result<Map<string, string>, FxError>>;

package/build/component/driver/teamsApp/appStudio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EAGjB,MAAM,EAKP,MAAM,wBAAwB,CAAC;AA0BhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAKpE,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAoBnC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAsJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAmE/B;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CA4CtC"}
+{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EAGN,WAAW,EAIX,OAAO,EACR,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAQpE,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAqBnC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAsJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAmE/B;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAgDtC"}