npm - @microsoft/teamsfx-core - Versions diffs - 1.5.0 → 1.5.1-alpha.3fc0dea41.0 - Mend

@microsoft/teamsfx-core 1.5.0 → 1.5.1-alpha.3fc0dea41.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (696) hide show

package/build/plugins/solution/fx-solution/v2/publish.js CHANGED Viewed

@@ -4,10 +4,12 @@ exports.publishApplication = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lodash_1 = require("lodash");
-const util = tslib_1.__importStar(require("util"));
+const typedi_1 = tslib_1.__importDefault(require("typedi"));
 const constants_1 = require("../../../../common/constants");
-const tools_1 = require("../../../../common/tools");
+const localizeUtils_1 = require("../../../../common/localizeUtils");
+const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
 const constants_2 = require("../constants");
+const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const executor_1 = require("./executor");
 const utils_1 = require("./utils");
 async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
@@ -15,9 +17,13 @@ async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     const inAzureProject = utils_1.isAzureProject(utils_1.getAzureSolutionSettings(ctx));
     const provisioned = envInfo.state[constants_2.GLOBAL_CONFIG][constants_2.SOLUTION_PROVISION_SUCCEEDED];
     if (inAzureProject && !provisioned) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision));
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(localizeUtils_1.getLocalizedString("core.NotProvisionedNotice", ctx.projectSetting.appName)), constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision));
     }
-    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
+    const pureExistingApp = projectSettingsHelper_1.isPureExistingApp(ctx.projectSetting);
+    // for minimized teamsfx project, there is only one plugin (app studio)
+    const plugins = pureExistingApp
+        ? [typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin)]
+        : utils_1.getSelectedPlugins(ctx.projectSetting);
     const thunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.publishApplication))
         .map((plugin) => {
@@ -28,10 +34,10 @@ async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
             thunk: () => plugin.publishApplication(ctx, inputs, envInfo, tokenProvider),
         };
     });
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.PublishStartNotice, constants_1.PluginDisplayName.Solution));
+    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.publish.startNotice", constants_1.PluginDisplayName.Solution));
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
     if (result.kind !== "success") {
-        const msg = util.format(tools_1.getStrings().solution.PublishFailNotice, ctx.projectSetting.appName);
+        const msg = localizeUtils_1.getLocalizedString("core.publish.failNotice", ctx.projectSetting.appName);
         (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(msg);
         return teamsfx_api_1.err(result.error);
     }

package/build/plugins/solution/fx-solution/v2/publish.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,~~mDAA6B~~;~~AAC7B~~,4DAAiE;AACjE,~~oDAAsD~~;~~AACtD~~,4CAKsB;AACtB,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAE/E,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,~~CACP,IAAI,~~CAAC,~~MAAM~~,CAAC,~~kBAAU~~,EAAE,~~CAAC,QAAQ,CAAC,oBAAoB,EAAE,~~GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,~~CACpF~~,~~EACD~~,0BAAc,EACd,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;~~IACvD~~,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,~~CAClB,IAAI,~~CAAC,~~MAAM~~,CAAC,~~kBAAU~~,EAAE,~~CAAC,QAAQ,CAAC,kBAAkB,EAAE,~~6BAAiB,CAAC,QAAQ,CAAC,~~CAClF~~,CAAC;~~IAEF~~,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,~~IAAI~~,CAAC,~~MAAM~~,~~CAAC,kBAAU,~~EAAE,~~CAAC,QAAQ,CAAC,iBAAiB,EAAE,~~GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;~~QAC7F~~,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}
1	+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,4DAA+B;AAC/B,4DAAiE;AACjE,oEAAsE;AACtE,oFAA6E;AAC7E,4CAKsB;AACtB,wEAA+D;AAC/D,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAE/E,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,kCAAkB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EACtF,0BAAc,EACd,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,eAAe,GAAG,yCAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC9D,uEAAuE;IACvE,MAAM,OAAO,GAAG,eAAe;QAC7B,CAAC,CAAC,CAAC,gBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC,CAAC,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,kCAAkB,CAAC,0BAA0B,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,kCAAkB,CAAC,yBAAyB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACtF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}

package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAGJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA+BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CA0FhC~~;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAYf"}
1	+ {"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAGJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA+BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAyFhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/build/plugins/solution/fx-solution/v2/scaffolding.js CHANGED Viewed

@@ -3,21 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scaffoldReadme = exports.scaffoldByPlugins = exports.scaffoldSourceCode = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../../../../common/tools");
 const question_1 = require("../question");
 const executor_1 = require("./executor");
 const utils_1 = require("./utils");
-const core_1 = require("../../../../core");
+const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const __1 = require("../../../..");
+const constants_1 = require("../constants");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const typedi_1 = require("typedi");
 const scaffolding_1 = require("../debug/scaffolding");
+const folder_1 = require("../../../../folder");
+const localizeUtils_1 = require("../../../../common/localizeUtils");
 async function scaffoldSourceCode(ctx, inputs) {
     var _a, _b, _c, _d, _e, _f;
     if (inputs.projectPath === undefined) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("projectPath is undefined"), "Solution", __1.SolutionError.InternelError));
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("projectPath is undefined"), "Solution", constants_1.SolutionError.InternelError));
     }
     const lang = inputs[question_1.AzureSolutionQuestionNames.ProgrammingLanguage];
     if (lang) {
@@ -47,25 +48,24 @@ async function scaffoldSourceCode(ctx, inputs) {
     if (result.kind === "success") {
         const capabilities = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || [];
         const azureResources = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || [];
-        // TODO: move this to if/else part when unify config job is completed
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs);
         if (scaffoldLocalDebugSettingsResult.isErr()) {
             return scaffoldLocalDebugSettingsResult;
         }
-        if (!core_1.isVSProject(ctx.projectSetting)) {
+        if (!projectSettingsHelper_1.isVSProject(ctx.projectSetting)) {
             await scaffoldReadme(capabilities, azureResources, inputs.projectPath);
         }
         if (utils_1.isAzureProject(solutionSettings)) {
-            await fs_extra_1.default.writeJSON(`${inputs.projectPath}/permissions.json`, __1.DEFAULT_PERMISSION_REQUEST, {
+            await fs_extra_1.default.writeJSON(`${inputs.projectPath}/permissions.json`, constants_1.DEFAULT_PERMISSION_REQUEST, {
                 spaces: 4,
             });
-            (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(__1.SolutionTelemetryEvent.Create, {
-                [__1.SolutionTelemetryProperty.Component]: __1.SolutionTelemetryComponentName,
-                [__1.SolutionTelemetryProperty.Success]: __1.SolutionTelemetrySuccess.Yes,
-                [__1.SolutionTelemetryProperty.Resources]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || []).join(";"),
-                [__1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
-                [__1.SolutionTelemetryProperty.ProgrammingLanguage]: (_c = (_b = ctx.projectSetting) === null || _b === void 0 ? void 0 : _b.programmingLanguage) !== null && _c !== void 0 ? _c : "",
+            (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
+                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+                [constants_1.SolutionTelemetryProperty.Resources]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || []).join(";"),
+                [constants_1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
+                [constants_1.SolutionTelemetryProperty.ProgrammingLanguage]: (_c = (_b = ctx.projectSetting) === null || _b === void 0 ? void 0 : _b.programmingLanguage) !== null && _c !== void 0 ? _c : "",
                 "host-type": "azure",
             });
         }
@@ -76,16 +76,16 @@ async function scaffoldSourceCode(ctx, inputs) {
                 if (spfxRes.isErr()) {
                     return teamsfx_api_1.err(spfxRes.error);
                 }
-                (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(__1.SolutionTelemetryEvent.Create, {
-                    [__1.SolutionTelemetryProperty.Component]: __1.SolutionTelemetryComponentName,
-                    [__1.SolutionTelemetryProperty.Success]: __1.SolutionTelemetrySuccess.Yes,
-                    [__1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
-                    [__1.SolutionTelemetryProperty.ProgrammingLanguage]: (_f = (_e = ctx.projectSetting) === null || _e === void 0 ? void 0 : _e.programmingLanguage) !== null && _f !== void 0 ? _f : "",
+                (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
+                    [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+                    [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+                    [constants_1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
+                    [constants_1.SolutionTelemetryProperty.ProgrammingLanguage]: (_f = (_e = ctx.projectSetting) === null || _e === void 0 ? void 0 : _e.programmingLanguage) !== null && _f !== void 0 ? _f : "",
                     "host-type": "spfx",
                 });
             }
         }
-        ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);
+        ctx.userInteraction.showMessage("info", `Success: ${localizeUtils_1.getLocalizedString("core.create.successNotice")}`, false);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
@@ -115,7 +115,7 @@ async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
         const azureResources = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || [];
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await scaffoldReadme(capabilities, azureResources, inputs.projectPath);
-        ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);
+        ctx.userInteraction.showMessage("info", `Success: ${localizeUtils_1.getLocalizedString("core.create.successNotice")}`, false);
         (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`finish scaffolding ${plugins.map((p) => p.name).join(",")}!`);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
@@ -132,7 +132,7 @@ async function scaffoldReadme(capabilities, azureResources, projectPath) {
     const hasMsgExt = capabilities.includes(question_1.MessageExtensionItem.id);
     const hasTab = capabilities.includes(question_1.TabOptionItem.id);
     if (hasTab && (hasBot || hasMsgExt)) {
-        const readme = path_1.default.join(__1.getTemplatesFolder(), "plugins", "solution", "README.md");
+        const readme = path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "solution", "README.md");
         if (await fs_extra_1.default.pathExists(readme)) {
             await fs_extra_1.default.copy(readme, `${projectPath}/${teamsfx_api_1.AutoGeneratedReadme}`);
         }

package/build/plugins/solution/fx-solution/v2/scaffolding.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":";;;;AAAA,wDAWgC;AAChC,~~oDAAsD;AACtD,~~0CAKqB;AACrB,yCAA6D;AAC7D,mCAKiB;AACjB,~~2CAA+C~~;~~AAC/C~~,wDAAwB;AACxB,gEAA0B;AAC1B,~~mCAQqB~~;~~AACrB~~,wEAA+D;AAC/D,mCAAmC;AACnC,sDAAkE;~~AAE3D~~,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc;;IAEd,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,UAAU,EACV,~~iBAAa~~,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,qCAA0B,CAAC,mBAAmB,CAAW,CAAC;IAC9E,IAAI,IAAI,EAAE;QACR,GAAG,CAAC,cAAc,CAAC,mBAAmB,GAAG,IAAI,CAAC;KAC/C;IACD,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,8BAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACrE,IAAI,SAAS,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,MAAM,GAAuB,OAAO;SACrC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,mEAAmE;IACnE,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,UAAU,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;KACjE;IACD,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC;QAE9D,~~qEAAqE;QACrE,~~oEAAoE;QACpE,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;YAC5C,OAAO,gCAAgC,CAAC;SACzC;QACD,IAAI,CAAC,~~kBAAW~~,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YACpC,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;SACzE;QACD,IAAI,sBAAc,CAAC,gBAAgB,CAAC,EAAE;YACpC,MAAM,kBAAE,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,mBAAmB,EAAE,~~8BAA0B~~,EAAE;gBACvF,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;YACH,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,~~0BAAsB~~,CAAC,MAAM,EAAE;gBACvE,CAAC,~~6BAAyB~~,CAAC,SAAS,CAAC,EAAE,~~kCAA8B~~;gBACrE,CAAC,~~6BAAyB~~,CAAC,OAAO,CAAC,EAAE,~~4BAAwB~~,CAAC,GAAG;gBACjE,CAAC,~~6BAAyB~~,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACzF,CAAC,~~6BAAyB~~,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1F,CAAC,~~6BAAyB~~,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;gBAC/C,WAAW,EAAE,OAAO;aACrB,CAAC,CAAC;SACJ;aAAM;YACL,0CAA0C;YAC1C,IAAI,UAAU,CAAC,kBAAkB,EAAE;gBACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;oBACnB,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBAC3B;gBACD,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,~~0BAAsB~~,CAAC,MAAM,EAAE;oBACvE,CAAC,~~6BAAyB~~,CAAC,SAAS,CAAC,EAAE,~~kCAA8B~~;oBACrE,CAAC,~~6BAAyB~~,CAAC,OAAO,CAAC,EAAE,~~4BAAwB~~,CAAC,GAAG;oBACjE,CAAC,~~6BAAyB~~,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC,CAAC,IAAI,CACnF,GAAG,CACJ;oBACD,CAAC,~~6BAAyB~~,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;oBAC/C,WAAW,EAAE,MAAM;iBACpB,CAAC,CAAC;aACJ;SACF;QACD,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,~~kBAAU~~,~~EAAE,~~CAAC,~~QAAQ~~,CAAC,~~qBAAqB,~~EAAE,~~EACzD~~,KAAK,CACN,CAAC;QACF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;~~AA7FD~~,~~gDA6FC~~;AAEM,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,OAA4B;;IAE5B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAC1C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,MAAM,GAAuB,OAAO;SACvC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC;QAE9D,oEAAoE;QACpE,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QAExE,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,~~kBAAU~~,~~EAAE,~~CAAC,~~QAAQ~~,CAAC,~~qBAAqB,~~EAAE,~~EACzD~~,KAAK,CACN,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AAvCD,8CAuCC;AAEM,KAAK,UAAU,cAAc,CAClC,YAAsB,EACtB,cAAwB,EACxB,WAAmB;IAEnB,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAClC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE;QACnC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,~~sBAAkB~~,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACnF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAhBD,wCAgBC"}
1	+ {"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/utils.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider, ProjectSettings } from "@microsoft/teamsfx-api";
-import { PluginsWithContext } from "../solution";
 import { EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
+import { PluginsWithContext } from "../types";
 export declare function getSelectedPlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings | undefined;
 export declare function isAzureProject(azureSettings: AzureSolutionSettings | undefined): boolean;

package/build/plugins/solution/fx-solution/v2/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAChB,MAAM,wBAAwB,CAAC;~~AAsBhC~~,OAAO,EAAE,~~kBAAkB~~,EAAE,MAAM,~~aAAa~~,CAAC;~~AAGjD~~,OAAO,EAAE,~~SAAS~~,EAAE,MAAM,~~iCAAiC~~,CAAC;~~AAE5D~~,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAExF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAE3F;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAKpF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CA+BhC~~;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,OAAO,CAAC,EAAE,SAAS,GAClB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,~~CAqDvB~~;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AA0BhC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAExF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAE3F;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAKpF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,OAAO,CAAC,EAAE,SAAS,GAClB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAgEvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}

package/build/plugins/solution/fx-solution/v2/utils.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.checkWhetherLocalDebugM365TenantMatches = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.setActivatedResourcePluginsV2 = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
-const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
 const tools_1 = require("../../../../common/tools");
@@ -9,7 +8,7 @@ const constants_1 = require("../constants");
 const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const util_1 = require("../utils/util");
-const util = tslib_1.__importStar(require("util"));
+const localizeUtils_1 = require("../../../../common/localizeUtils");
 function getSelectedPlugins(projectSettings) {
     return ResourcePluginContainer_1.getActivatedV2ResourcePlugins(projectSettings);
 }
@@ -87,16 +86,16 @@ function parseUserName(appStudioToken) {
 exports.parseUserName = parseUserName;
 async function checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, appStudioTokenProvider) {
     if (localDebugTenantId) {
-        const m365TenantId = parseTeamsAppTenantId(await (appStudioTokenProvider === null || appStudioTokenProvider === void 0 ? void 0 : appStudioTokenProvider.getJsonObject()));
-        if (m365TenantId.isErr()) {
-            throw teamsfx_api_1.err(m365TenantId.error);
+        const maybeM365TenantId = parseTeamsAppTenantId(await (appStudioTokenProvider === null || appStudioTokenProvider === void 0 ? void 0 : appStudioTokenProvider.getJsonObject()));
+        if (maybeM365TenantId.isErr()) {
+            return maybeM365TenantId;
         }
-        const m365UserAccount = parseUserName(await (appStudioTokenProvider === null || appStudioTokenProvider === void 0 ? void 0 : appStudioTokenProvider.getJsonObject()));
-        if (m365UserAccount.isErr()) {
-            throw teamsfx_api_1.err(m365UserAccount.error);
+        const maybeM365UserAccount = parseUserName(await (appStudioTokenProvider === null || appStudioTokenProvider === void 0 ? void 0 : appStudioTokenProvider.getJsonObject()));
+        if (maybeM365UserAccount.isErr()) {
+            return maybeM365UserAccount;
         }
-        if (m365TenantId.value !== localDebugTenantId) {
-            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, "localSettings.json");
+        if (maybeM365TenantId.value !== localDebugTenantId) {
+            const errorMessage = localizeUtils_1.getLocalizedString("core.localDebug.tenantConfirmNotice", localDebugTenantId, maybeM365UserAccount.value, "localSettings.json");
             return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(errorMessage), "Solution", constants_1.SolutionError.CannotLocalDebugInDifferentTenant));
         }
     }
@@ -123,7 +122,18 @@ function fillInSolutionSettings(projectSettings, answers) {
         return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("capabilities is empty"), constants_1.SolutionSource, constants_1.SolutionError.InternelError));
     }
     let hostType = answers[question_1.AzureSolutionQuestionNames.HostType];
-    if (capabilities.includes(question_1.BotOptionItem.id) ||
+    if (capabilities.includes(question_1.NotificationOptionItem.id)) {
+        // find and replace "NotificationOptionItem" to "BotOptionItem", so it does not impact capabilities in projectSettings.json
+        const notificationIndex = capabilities.indexOf(question_1.NotificationOptionItem.id);
+        if (notificationIndex !== -1) {
+            capabilities[notificationIndex] = question_1.BotOptionItem.id;
+            // dedup
+            capabilities = [...new Set(capabilities)];
+            answers[question_1.AzureSolutionQuestionNames.Scenario] = question_1.BotScenario.NotificationBot;
+        }
+        hostType = question_1.HostTypeOptionAzure.id;
+    }
+    else if (capabilities.includes(question_1.BotOptionItem.id) ||
         capabilities.includes(question_1.MessageExtensionItem.id) ||
         capabilities.includes(question_1.TabOptionItem.id)) {
         hostType = question_1.HostTypeOptionAzure.id;

package/build/plugins/solution/fx-solution/v2/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"~~;;;;~~AAAA,wDAiBgC;AAChC,sFAAsF;AACtF,~~oDAA+F~~;~~AAC/F~~,4CAKsB;AACtB,~~0CAWqB~~;AACrB,wEAAoG;~~AAEpG~~,wCAAiD;~~AACjD~~,~~mDAA6B~~;~~AAG7B~~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~~YAAY~~,GAAG,qBAAqB,CAAC,MAAM,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,aAAa,EAAE,CAAA,CAAC,CAAC;~~QAC1F~~,IAAI,~~YAAY~~,CAAC,KAAK,EAAE,EAAE;~~YACxB~~,~~MAAM~~,~~iBAAG~~,CAAC~~,YAAY,CAAC,KAAK,CAAC,CAAC~~;~~SAC/B~~;QAED,MAAM,~~eAAe~~,GAAG,aAAa,CAAC,MAAM,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,aAAa,EAAE,CAAA,CAAC,CAAC;~~QACrF~~,IAAI,~~eAAe~~,CAAC,KAAK,EAAE,EAAE;~~YAC3B~~,~~MAAM~~,~~iBAAG~~,CAAC~~,eAAe,CAAC,KAAK,CAAC,CAAC~~;~~SAClC~~;QAED,IAAI,~~YAAY~~,CAAC,KAAK,KAAK,kBAAkB,EAAE;~~YAC7C~~,MAAM,YAAY,~~GAAW~~,~~IAAI~~,~~CAAC~~,~~MAAM~~,~~CACtC~~,~~kBAAU,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EACnD,~~kBAAkB,EAClB,~~eAAe~~,CAAC,KAAK,~~EACrB~~,oBAAoB,CACrB,CAAC;~~YAEF~~,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,YAAY,CAAC,EACvB,UAAU,EACV,yBAAa,CAAC,iCAAiC,CAChD,CACF,CAAC;SACH;KACF;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;~~AAlCD~~,~~0FAkCC~~;AAED,iDAAiD;AACjD,SAAgB,4BAA4B,CAC1C,aAA+B,EAC/B,cAAwC,EACxC,OAAmB;IAEnB,OAAO,qBAAqB,CAAC,cAAqD,CAAC,CAAC,OAAO,CACzF,CAAC,gBAAgB,EAAE,EAAE;QACnB,IAAI,4BAAoB,EAAE,EAAE;YAC1B,OAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;SAC7D;aAAM;YACL,aAAa,CAAC,QAAQ,CAAC,kDAAyB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;SAC/E;QACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC,CACF,CAAC;AACJ,CAAC;AAfD,oEAeC;AAED,SAAgB,sBAAsB,CACpC,eAAgC,EAChC,OAAe;IAEf,MAAM,gBAAgB,GAAI,eAAe,CAAC,gBAA0C,IAAI,EAAE,CAAC;IAC3F,IAAI,YAAY,GAAI,OAAO,CAAC,qCAA0B,CAAC,YAAY,CAAc,IAAI,EAAE,CAAC;IACxF,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAClC,0BAAc,EACd,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,IAAI,QAAQ,GAAG,OAAO,CAAC,qCAA0B,CAAC,QAAQ,CAAW,CAAC;IACtE,~~IACE~~,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;QACvC,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC;QAC9C,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EACvC;QACA,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACnC;SAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,sBAAW,CAAC,EAAE,CAAC,EAAE;QAChD,mHAAmH;QACnH,YAAY,GAAG,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;QAClC,QAAQ,GAAG,6BAAkB,CAAC,EAAE,CAAC;KAClC;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,uBAAuB,CAAC,EAClC,0BAAc,EACd,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,gBAAgB,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACrC,IAAI,cAAoC,CAAC;IACzC,IAAI,QAAQ,KAAK,8BAAmB,CAAC,EAAE,IAAI,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;QAClF,cAAc,GAAG,OAAO,CAAC,qCAA0B,CAAC,cAAc,CAAa,CAAC;QAChF,IAAI,cAAc,EAAE;YAClB,IACE,CAAC,cAAc,CAAC,QAAQ,CAAC,2BAAgB,CAAC,EAAE,CAAC;gBAC3C,cAAc,CAAC,QAAQ,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;gBAChD,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,EAClD;gBACA,cAAc,CAAC,IAAI,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;aAC/C;SACF;;YAAM,cAAc,GAAG,EAAE,CAAC;KAC5B;IACD,gBAAgB,CAAC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACvD,gBAAgB,CAAC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAEnD,gCAAgC;IAChC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAC/C,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;~~AAxDD~~,~~wDAwDC~~;AAED,SAAgB,6BAA6B,CAAC,MAAY;IACxD,OAAO,MAAM,CAAC,yBAAa,CAAC,IAAI,MAAM,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;AACtF,CAAC;AAFD,sEAEC;AAED,SAAgB,wBAAwB,CACtC,GAAoB,EACpB,eAAyB;IAEzB,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,uBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACvF,CAAC;AALD,4DAKC"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/addFeature.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addFeature.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addFeature.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,~~EACL~~,MAAM,wBAAwB,CAAC;~~AA4BhC~~,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA0BjD;AAED,qBAAa,uBAAwB,YAAW,EAAE,CAAC,mBAAmB;IAC9D,gBAAgB,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,UAAU,EAAE,EAAE,CAAC,kBAAkB,GAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,gBAAgB,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,UAAU,EAAE,EAAE,CAAC,kBAAkB,GAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,qBAAqB,CACzB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,GAC9F,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAI9B,eAAe,CACnB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,YAAY,EAAE,EAAE,CAAC,kBAAkB,EAAE,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAMlC;AAED,wBAAsB,UAAU,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,wBAAwB,EACnC,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CA+EhC~~"}
1	+ {"version":3,"file":"addFeature.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addFeature.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EAEL,MAAM,wBAAwB,CAAC;AA2BhC,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA0BjD;AAED,qBAAa,uBAAwB,YAAW,EAAE,CAAC,mBAAmB;IAC9D,gBAAgB,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,UAAU,EAAE,EAAE,CAAC,kBAAkB,GAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,gBAAgB,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,UAAU,EAAE,EAAE,CAAC,kBAAkB,GAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAI3B,qBAAqB,CACzB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,GAC9F,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAI9B,eAAe,CACnB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,YAAY,EAAE,EAAE,CAAC,kBAAkB,EAAE,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;CAMlC;AAED,wBAAsB,UAAU,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,wBAAwB,EACnC,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAsEhC"}

package/build/plugins/solution/fx-solution/v3/addFeature.js CHANGED Viewed

@@ -12,12 +12,13 @@ const constants_1 = require("./constants");
 const solutionSettingsHelper_1 = require("../utils/solutionSettingsHelper");
 const question_1 = require("../../../../core/question");
 const question_2 = require("../question");
-const collaborator_1 = require("../../../../core/collaborator");
 const scaffolding_1 = require("../debug/scaffolding");
 const lodash_1 = require("lodash");
+const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
 function getAllFeaturePlugins() {
     return [
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.frontend),
+        typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.bot),
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.aad),
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.function),
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.apim),
@@ -28,11 +29,10 @@ function getAllFeaturePlugins() {
     ];
 }
 async function getQuestionsForAddFeature(ctx, inputs) {
-    var _a;
     const node = new teamsfx_api_1.QTreeNode({ type: "group" });
     const plugins = getAllFeaturePlugins();
     const featureNode = new teamsfx_api_1.QTreeNode(questions_1.selectMultipleFeaturesQuestion);
-    if (!((_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.programmingLanguage)) {
+    if (!ctx.projectSetting.programmingLanguage) {
         const programmingLanguage = new teamsfx_api_1.QTreeNode(question_1.ProgrammingLanguageQuestion);
         node.addChild(programmingLanguage);
     }
@@ -40,7 +40,7 @@ async function getQuestionsForAddFeature(ctx, inputs) {
     for (const plugin of plugins) {
         staticOptions.push({
             id: plugin.name,
-            label: plugin.description || "",
+            label: plugin.description || plugin.displayName || plugin.name,
         });
         if (plugin.getQuestionsForAddInstance) {
             const childNode = await plugin.getQuestionsForAddInstance(ctx, inputs);
@@ -81,6 +81,8 @@ class DefaultManifestProvider {
 exports.DefaultManifestProvider = DefaultManifestProvider;
 async function addFeature(ctx, inputs, telemetryProps) {
     solutionSettingsHelper_1.ensureSolutionSettings(ctx.projectSetting);
+    if (!ctx.projectSetting.programmingLanguage && inputs[question_1.ProgrammingLanguageQuestion.name])
+        ctx.projectSetting.programmingLanguage = inputs[question_1.ProgrammingLanguageQuestion.name];
     let solutionSettings = ctx.projectSetting.solutionSettings;
     const existingSet = new Set();
     let newSet = new Set();
@@ -113,25 +115,16 @@ async function addFeature(ctx, inputs, telemetryProps) {
                 return teamsfx_api_1.err(res.error);
         }
     }
-    const updateInputs = Object.assign(Object.assign({}, addFeatureInputs), { newPlugins: newArray });
-    for (const pluginName of existingArray) {
-        const plugin = typedi_1.Container.get(pluginName);
-        if (plugin.updateCode) {
-            const res = await plugin.updateCode(contextWithManifestProvider, updateInputs);
-            if (res.isErr())
-                return teamsfx_api_1.err(res.error);
-        }
-    }
     const bicepRes = await arm_1.default.generateBicep(contextWithManifestProvider, inputs, newArray, existingArray);
     if (bicepRes.isErr()) {
         return teamsfx_api_1.err(bicepRes.error);
     }
     ctx.projectSetting = projectSettingsNew;
     solutionSettings = ctx.projectSetting.solutionSettings;
-    if (collaborator_1.hasAzureResource(ctx.projectSetting)) {
+    if (projectSettingsHelper_1.hasAzureResource(ctx.projectSetting)) {
         solutionSettings.hostType = question_2.HostTypeOptionAzure.id;
     }
-    else if (collaborator_1.hasSPFx(ctx.projectSetting)) {
+    else if (projectSettingsHelper_1.hasSPFx(ctx.projectSetting)) {
         solutionSettings.hostType = question_2.HostTypeOptionSPFx.id;
     }
     const scaffoldRes = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs, undefined, false);

package/build/plugins/solution/fx-solution/v3/addFeature.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,~~wDAWgC~~;AAChC,mCAAmC;~~AAGnC~~,qDAAuE;AACvE,yDAAyB;AACzB,2CAAwD;AACxD,4EAAyE;AACzE,wDAAwE;AACxE,0CAAsE;~~AAEtE~~,~~gEAA0E;AAC1E,~~sDAAkE;AAClE,mCAAmC;~~AAEnC~~,SAAS,oBAAoB;IAC3B,OAAO;QACL,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,GAAG,CAAC;QACzD,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,IAAI,CAAC;QAC1D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,GAAG,CAAC;QACzD,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,IAAI,CAAC;KAC3D,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;;IAEhC,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IAClE,IAAI,CAAC,~~CAAA,MAAA,~~GAAG,CAAC,cAAc,CAAC,~~gBAAgB,0CAAE,~~mBAAmB,~~CAAA,~~EAAE;~~QAC7D~~,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;QACvE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KACpC;IACD,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,aAAa,CAAC,IAAI,CAAC;YACjB,EAAE,EAAE,MAAM,CAAC,IAAI;YACf,KAAK,EAAE,MAAM,CAAC,WAAW,IAAI,~~EAAE~~;~~SAChC~~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~~YAAY,mCACb,gBAAgB,KACnB,UAAU,EAAE,~~QAAQ,~~GACrB,CAAC;IACF,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE;QACtC,MAAM,MAAM,~~GAAG,~~kBAAS,CAAC,GAAG,CAAc,UAAU,CAAC,CAAC;QACtD,IAAI,~~MAAM,CAAC,UAAU,EAAE;YACrB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,2BAA2B,EAAE,YAAY,CAAC,CAAC;YAC/E,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxC;KACF;IACD,MAAM,QAAQ,GAAG,MAAM,aAAG,CAAC,aAAa,CACtC,2BAA2B,EAC3B,MAAM,EACN,QAAQ,EACR,aAAa,CACd,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;QACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC5B;IAED,GAAG,CAAC,cAAc,GAAG,kBAAkB,CAAC;IACxC,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;IAEhF,IAAI~~,+BAAgB~~,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QACxC,gBAAgB,CAAC,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACpD;SAAM,IAAI,~~sBAAO,~~CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QACtC,gBAAgB,CAAC,QAAQ,GAAG,6BAAkB,CAAC,EAAE,CAAC;KACnD;IAED,MAAM,WAAW,GAAG,MAAM,wCAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACpF,IAAI,WAAW,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEvD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;~~AAnFD~~,~~gCAmFC~~;AAED;;;;;;GAMG;AACH,KAAK,UAAU,2BAA2B,CACxC,GAAmC,EACnC,MAAgC,EAChC,WAAwB,EACxB,QAAqB;IAErB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACX,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IACH,kDAAkD;IAClD,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,UAAU,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC1B;YACD,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC1B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACd;SACF;KACF;IACD,kDAAkD;IAClD,OAAO,IAAI,EAAE;QACX,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,UAAU,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACrD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;oBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC1B;gBACD,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;oBAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACd;aACF;SACF;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,IAAI,KAAK,KAAK,KAAK;YAAE,MAAM;KAC5B;IACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAChC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;SACxB;KACF;IACD,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;AACpB,CAAC"}
1	+ {"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAYgC;AAChC,mCAAmC;AAEnC,qDAAuE;AACvE,yDAAyB;AACzB,2CAAwD;AACxD,4EAAyE;AACzE,wDAAwE;AACxE,0CAAsE;AACtE,sDAAkE;AAClE,mCAAmC;AACnC,oFAAqF;AAErF,SAAS,oBAAoB;IAC3B,OAAO;QACL,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,GAAG,CAAC;QACzD,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,GAAG,CAAC;QACzD,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,IAAI,CAAC;QAC1D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,QAAQ,CAAC;QAC9D,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,GAAG,CAAC;QACzD,kBAAS,CAAC,GAAG,CAAc,qCAAyB,CAAC,IAAI,CAAC;KAC3D,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;IAEhC,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,MAAM,WAAW,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IAClE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,EAAE;QAC3C,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;QACvE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;KACpC;IACD,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,aAAa,CAAC,IAAI,CAAC;YACjB,EAAE,EAAE,MAAM,CAAC,IAAI;YACf,KAAK,EAAE,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI;SAC/D,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,0BAA0B,EAAE;YACrC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACvE,IAAI,SAAS,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,SAAS,CAAC,KAAK,EAAE;gBACnB,SAAS,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;gBACtD,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aACvC;SACF;KACF;IACD,0CAA8B,CAAC,aAAa,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC3B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AA7BD,8DA6BC;AAED,MAAa,uBAAuB;IAClC,KAAK,CAAC,gBAAgB,CACpB,GAAe,EACf,MAAgC,EAChC,UAAiC;QAEjC,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAoB,qCAAyB,CAAC,SAAS,CAAC,CAAC;QAC1F,OAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACrE,CAAC;IACD,KAAK,CAAC,gBAAgB,CACpB,GAAe,EACf,MAAgC,EAChC,UAAiC;QAEjC,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAoB,qCAAyB,CAAC,SAAS,CAAC,CAAC;QAC1F,OAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACrE,CAAC;IACD,KAAK,CAAC,qBAAqB,CACzB,GAAe,EACf,MAAgC,EAChC,UAA+F;QAE/F,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAoB,qCAAyB,CAAC,SAAS,CAAC,CAAC;QAC1F,OAAO,MAAM,WAAW,CAAC,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAC1E,CAAC;IACD,KAAK,CAAC,eAAe,CACnB,GAAe,EACf,MAAgC,EAChC,YAAqC;QAErC,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAoB,qCAAyB,CAAC,SAAS,CAAC,CAAC;QAC1F,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QACzE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC;CACF;AAnCD,0DAmCC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAe,EACf,MAAmC,EACnC,cAAqB;IAErB,+CAAsB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC3C,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,IAAI,MAAM,CAAC,sCAA2B,CAAC,IAAI,CAAC;QACrF,GAAG,CAAC,cAAc,CAAC,mBAAmB,GAAG,MAAM,CAAC,sCAA2B,CAAC,IAAI,CAAC,CAAC;IACpF,IAAI,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;IACpF,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,IAAI,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,MAAM,2BAA2B,mCAC5B,GAAG,KACN,mBAAmB,EAAE,IAAI,uBAAuB,EAAE,GACnD,CAAC;IACF,MAAM,kBAAkB,GAAG,kBAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAClD,2BAA2B,EAC3B,MAAM,EACN,WAAW,EACX,MAAM,CACP,CAAC;IACF,MAAM,kBAAkB,GAAG,GAAG,CAAC,cAAc,CAAC;IAC9C,IAAI,UAAU,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACrD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;IAC1B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,MAAM,aAAa,GAAa,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAa,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE1D,MAAM,gBAAgB,mCACjB,MAAM,KACT,kBAAkB,EAAE,kBAAkB,GACvC,CAAC;IACF,2BAA2B,CAAC,cAAc,GAAG,kBAAkB,CAAC;IAChE,KAAK,MAAM,UAAU,IAAI,QAAQ,EAAE;QACjC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,UAAU,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,2BAA2B,EAAE,gBAAgB,CAAC,CAAC;YACrF,IAAI,GAAG,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxC;KACF;IACD,MAAM,QAAQ,GAAG,MAAM,aAAG,CAAC,aAAa,CACtC,2BAA2B,EAC3B,MAAM,EACN,QAAQ,EACR,aAAa,CACd,CAAC;IACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE;QACpB,OAAO,iBAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC5B;IAED,GAAG,CAAC,cAAc,GAAG,kBAAkB,CAAC;IACxC,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;IAEhF,IAAI,wCAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QACxC,gBAAgB,CAAC,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACpD;SAAM,IAAI,+BAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QACtC,gBAAgB,CAAC,QAAQ,GAAG,6BAAkB,CAAC,EAAE,CAAC;KACnD;IAED,MAAM,WAAW,GAAG,MAAM,wCAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACpF,IAAI,WAAW,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEvD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA1ED,gCA0EC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,2BAA2B,CACxC,GAAmC,EACnC,MAAgC,EAChC,WAAwB,EACxB,QAAqB;IAErB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACX,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IACH,kDAAkD;IAClD,KAAK,MAAM,UAAU,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,UAAU,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC1B;YACD,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC1B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;gBAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACd;SACF;KACF;IACD,kDAAkD;IAClD,OAAO,IAAI,EAAE;QACX,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAc,UAAU,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACpD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACrD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;oBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC1B;gBACD,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE;oBAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACd;aACF;SACF;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC;QACvB,IAAI,KAAK,KAAK,KAAK;YAAE,MAAM;KAC5B;IACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAChC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;SACxB;KACF;IACD,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;AACpB,CAAC"}

package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,OAAO,EACP,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;~~AAQhC~~,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAkCjD;AACD,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CA0ChC~~"}
1	+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,OAAO,EACP,IAAI,EAGJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAOhC,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAkCjD;AACD,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqChC"}

package/build/plugins/solution/fx-solution/v3/deploy.js CHANGED Viewed

@@ -3,14 +3,12 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = exports.getQuestionsForDeploy = void 0;
-const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const typedi_1 = require("typedi");
-const util = tslib_1.__importStar(require("util"));
 const constants_1 = require("../../../../common/constants");
-const tools_1 = require("../../../../common/tools");
 const executor_1 = require("../v2/executor");
 const questions_1 = require("../../utils/questions");
+const localizeUtils_1 = require("../../../../common/localizeUtils");
 async function getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider) {
     const solutionSetting = ctx.projectSetting.solutionSettings;
     const pluginNames = solutionSetting ? solutionSetting.activeResourcePlugins : [];
@@ -66,17 +64,17 @@ async function deploy(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
             },
         };
     });
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.SelectedPluginsToDeployNotice, constants_1.PluginDisplayName.Solution, JSON.stringify(thunks.map((p) => p.pluginName))));
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployStartNotice, constants_1.PluginDisplayName.Solution));
+    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.selectedPluginsToDeployNotice", constants_1.PluginDisplayName.Solution, JSON.stringify(thunks.map((p) => p.pluginName))));
+    ctx.logProvider.info(localizeUtils_1.getLocalizedString("core.deploy.startNotice", constants_1.PluginDisplayName.Solution));
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
     if (result.kind === "success") {
-        const msg = util.format(`Success: ${tools_1.getStrings().solution.DeploySuccessNotice}`, ctx.projectSetting.appName);
+        const msg = localizeUtils_1.getLocalizedString("core.deploy.successNotice", ctx.projectSetting.appName);
         ctx.logProvider.info(msg);
         ctx.userInteraction.showMessage("info", msg, false);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
-        const msg = util.format(tools_1.getStrings().solution.DeployFailNotice, ctx.projectSetting.appName);
+        const msg = localizeUtils_1.getLocalizedString("core.deploy.failNotice", ctx.projectSetting.appName);
         ctx.logProvider.info(msg);
         return teamsfx_api_1.err(result.error);
     }

package/build/plugins/solution/fx-solution/v3/deploy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC~~;;;;~~AAElC,wDAagC;AAChC,mCAAmC;AACnC,~~mDAA6B;AAC7B,~~4DAAiE;AACjE,~~oDAAsD;AACtD,~~6CAAqD;AACrD,qDAAmE;~~AAE5D~~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~~IAAI~~,~~CAAC~~,~~MAAM~~,~~CACT~~,~~kBAAU,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EACnD,~~6BAAiB,CAAC,QAAQ,EAC1B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAChD,CACF,CAAC;IACF,GAAG,CAAC,WAAW,CAAC,IAAI,~~CAClB,IAAI,~~CAAC,~~MAAM~~,CAAC,~~kBAAU~~,EAAE,~~CAAC,QAAQ,CAAC,iBAAiB,EAAE,~~6BAAiB,CAAC,QAAQ,CAAC,~~CACjF~~,CAAC;~~IACF~~,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,~~IAAI~~,CAAC,~~MAAM~~,~~CACrB,YAAY,kBAAU,~~EAAE,~~CAAC,QAAQ,CAAC,mBAAmB,EAAE,EACvD,~~GAAG,CAAC,cAAc,CAAC,OAAO,~~CAC3B~~,CAAC;~~QACF~~,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACpD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,MAAM,GAAG,GAAG,~~IAAI~~,CAAC,~~MAAM~~,~~CAAC,kBAAU,~~EAAE,~~CAAC,QAAQ,CAAC,gBAAgB,EAAE,~~GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;~~QAC5F~~,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;~~AAhDD~~,~~wBAgDC~~"}
1	+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/provision.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAKpB,OAAO,EACP,IAAI,~~EAEJ~~,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;~~AA6BhC~~,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,~~CAwNxC~~;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiDhC;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CAgJhC~~;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CA6BhC~~;AAED,wBAAsB,eAAe,CACnC,sBAAsB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC"}
1	+ {"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAKpB,OAAO,EACP,IAAI,EAGJ,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAuBhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CA4MxC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiDhC;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA2JhC;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAuBhC;AAED,wBAAsB,eAAe,CACnC,sBAAsB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC"}