@microsoft/teamsfx-core 1.2.0-rc.0 → 1.2.2-alpha.01a113d2.0

package/build/plugins/solution/fx-solution/v2/provision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AA2ChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CA4O3D;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgDjG"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAsChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CA4O3D;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgDjG"}

package/build/plugins/solution/fx-solution/v2/provision.js

@@ -70,7 +70,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
         }
     }
     const solutionInputs = utils_1.extractSolutionInputs(newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"]);
-    const plugins = utils_1.getSelectedPlugins(azureSolutionSettings);
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
     const provisionThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
         .map((plugin) => {

package/build/plugins/solution/fx-solution/v2/provision.js.map

@@ -1 +1 @@
-{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/provisionLocal.js

@@ -37,7 +37,7 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
     if (m365TenantMatches.isErr()) {
         return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
     }
-    const plugins = utils_1.getSelectedPlugins(azureSolutionSettings);
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
     const provisionLocalResourceThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
         .map((plugin) => {

package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}

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

@@ -17,7 +17,7 @@ async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     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));
     }
-    const plugins = utils_1.getSelectedPlugins(utils_1.getAzureSolutionSettings(ctx));
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
     const thunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.publishApplication))
         .map((plugin) => {

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

@@ -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,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEzF,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,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,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"}
+{"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,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEzF,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"}

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

@@ -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,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4EhC;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,CA8BhC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}
+{"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,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqFhC;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,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}

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

@@ -14,7 +14,7 @@ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const typedi_1 = require("typedi");
 const scaffolding_1 = require("../debug/scaffolding");
 async function scaffoldSourceCode(ctx, inputs) {
-    var _a, _b, _c;
+    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));
     }
@@ -26,7 +26,7 @@ async function scaffoldSourceCode(ctx, inputs) {
     const fillinRes = utils_1.fillInSolutionSettings(solutionSettings, inputs);
     if (fillinRes.isErr())
         return teamsfx_api_1.err(fillinRes.error);
-    const plugins = utils_1.getSelectedPlugins(solutionSettings);
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
     let thunks = plugins
         .filter((plugin) => !!plugin.scaffoldSourceCode)
         .map((plugin) => {
@@ -62,6 +62,7 @@ async function scaffoldSourceCode(ctx, inputs) {
                 [__1.SolutionTelemetryProperty.Resources]: solutionSettings.azureResources.join(";"),
                 [__1.SolutionTelemetryProperty.Capabilities]: solutionSettings.capabilities.join(";"),
                 [__1.SolutionTelemetryProperty.ProgrammingLanguage]: (_c = (_b = ctx.projectSetting) === null || _b === void 0 ? void 0 : _b.programmingLanguage) !== null && _c !== void 0 ? _c : "",
+                "host-type": "azure",
             });
         }
         else {
@@ -71,6 +72,13 @@ 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.capabilities.join(";"),
+                    [__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);
@@ -82,6 +90,10 @@ async function scaffoldSourceCode(ctx, inputs) {
 }
 exports.scaffoldSourceCode = scaffoldSourceCode;
 async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
+    var _a, _b, _c;
+    if (plugins.length === 0)
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(`start scaffolding ${plugins.map((p) => p.name).join(",")}.....`);
     const thunks = plugins
         .filter((plugin) => !!plugin.scaffoldSourceCode)
         .map((plugin) => {
@@ -100,9 +112,11 @@ async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
         // 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);
+        (_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);
     }
     else {
+        (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${plugins.map((p) => p.name).join(",")}!`);
         return teamsfx_api_1.err(result.error);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}
+{"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

@@ -1,6 +1,6 @@
-import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider, ProjectSettings } from "@microsoft/teamsfx-api";
 import { PluginsWithContext } from "../solution";
-export declare function getSelectedPlugins(azureSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+export declare function getSelectedPlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings;
 export declare function isAzureProject(azureSettings: AzureSolutionSettings): boolean;
 export declare function combineRecords<T>(records: {
@@ -8,7 +8,7 @@ export declare function combineRecords<T>(records: {
     result: T;
 }[]): Record<string, T>;
 export declare function extractSolutionInputs(record: Json): v2.SolutionInputs;
-export declare function reloadV2Plugins(solutionSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+export declare function reloadV2Plugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function ensurePermissionRequest(solutionSettings: AzureSolutionSettings, permissionRequestProvider: PermissionRequestProvider): Promise<Result<Void, FxError>>;
 export declare function parseTeamsAppTenantId(appStudioToken?: Record<string, unknown>): Result<string, FxError>;
 export declare function parseUserName(appStudioToken?: Record<string, unknown>): Result<string, FxError>;

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

@@ -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,EACvB,MAAM,wBAAwB,CAAC;AAsBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;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,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;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,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAMnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}
+{"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;AAIjD,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAMxF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;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,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAMrF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;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,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAMnE;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

@@ -10,8 +10,9 @@ const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const util_1 = require("../utils/util");
 const util = tslib_1.__importStar(require("util"));
-function getSelectedPlugins(azureSettings) {
-    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSettings);
+function getSelectedPlugins(projectSettings) {
+    const azureSettings = projectSettings.solutionSettings;
+    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(projectSettings);
     azureSettings.activeResourcePlugins = plugins.map((p) => p.name);
     return plugins;
 }
@@ -45,8 +46,9 @@ function extractSolutionInputs(record) {
     };
 }
 exports.extractSolutionInputs = extractSolutionInputs;
-function reloadV2Plugins(solutionSettings) {
-    const res = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(solutionSettings);
+function reloadV2Plugins(projectSettings) {
+    const solutionSettings = projectSettings.solutionSettings;
+    const res = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(projectSettings);
     solutionSettings.activeResourcePlugins = res.map((p) => p.name);
     return res;
 }
@@ -100,7 +102,7 @@ async function checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, appSt
             throw teamsfx_api_1.err(m365UserAccount.error);
         }
         if (m365TenantId.value !== localDebugTenantId) {
-            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, tools_1.isMultiEnvEnabled() ? "localSettings.json" : "default.userdata");
+            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, "localSettings.json");
             return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(errorMessage), "Solution", constants_1.SolutionError.CannotLocalDebugInDifferentTenant));
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;;AAAA,wDAgBgC;AAChC,sFAAsF;AACtF,oDAAyE;AACzE,4CAKsB;AACtB,0CAWqB;AACrB,wEAA2E;AAE3E,wCAAiD;AACjD,mDAA6B;AAE7B,SAAgB,kBAAkB,CAAC,aAAoC;IACrE,MAAM,OAAO,GAAG,uDAA6B,CAAC,aAAa,CAAC,CAAC;IAC7D,aAAa,CAAC,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,gDAIC;AAED,SAAgB,wBAAwB,CAAC,GAAe;IACtD,OAAO,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;AACtE,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,aAAoC;IACjE,OAAO,8BAAmB,CAAC,EAAE,KAAK,aAAa,CAAC,QAAQ,CAAC;AAC3D,CAAC;AAFD,wCAEC;AAED,SAAgB,cAAc,CAAI,OAAsC;IACtE,MAAM,GAAG,GAA6B,EAAE,CAAC;IACzC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,wCAOC;AAED,SAAgB,qBAAqB,CAAC,MAAY;IAChD,OAAO;QACL,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;QAChD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC;QAC9C,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;QAC5C,gBAAgB,EAAE,SAAS;QAC3B,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC;QACxC,kBAAkB,EAAE,MAAM,CAAC,wCAA4B,CAAC;QACxD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;KAC7B,CAAC;AACJ,CAAC;AAXD,sDAWC;AAED,SAAgB,eAAe,CAAC,gBAAuC;IACrE,MAAM,GAAG,GAAG,uDAA6B,CAAC,gBAAgB,CAAC,CAAC;IAC5D,gBAAgB,CAAC,qBAAqB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,0CAIC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,gBAAuC,EACvC,yBAAoD;IAEpD,IAAI,gBAAgB,CAAC,aAAa,EAAE;QAClC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;QACrC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,2CAA2C,CAAC,EACtD,0BAAc,EACd,yBAAa,CAAC,6BAA6B,CAC5C,CACF,CAAC;KACH;IAED,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,sBAAsB,EAAE,CAAC;IACxE,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAC5B,OAAO,MAAM,CAAC,GAAG,CAAC,iBAAG,CAAC,CAAC;KACxB;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAxBD,0DAwBC;AAED,SAAgB,qBAAqB,CACnC,cAAwC;IAExC,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAC1C,0BAAc,EACd,yBAAa,CAAC,gBAAgB,CAC/B,CACF,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,IACE,gBAAgB,KAAK,SAAS;QAC9B,CAAC,CAAC,OAAO,gBAAgB,KAAK,QAAQ,CAAC;QACvC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAC7B;QACA,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,iCAAiC,CAAC,EAC5C,0BAAc,EACd,yBAAa,CAAC,kBAAkB,CACjC,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,gBAAgB,CAAC,CAAC;AAC9B,CAAC;AA5BD,sDA4BC;AAED,SAAgB,aAAa,CAAC,cAAwC;IACpE,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAC1C,UAAU,EACV,yBAAa,CAAC,gBAAgB,CAC/B,CACF,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACtF,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,8CAA8C,CAAC,EACzD,UAAU,EACV,yBAAa,CAAC,UAAU,CACzB,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAtBD,sCAsBC;AAEM,KAAK,UAAU,uCAAuC,CAC3D,kBAA2B,EAC3B,sBAA+C;IAE/C,IAAI,kBAAkB,EAAE;QACtB,MAAM,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,yBAAiB,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,kBAAkB,CAChE,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;IAExC,OAAO,qBAAqB,CAAC,cAAqD,CAAC,CAAC,OAAO,CACzF,CAAC,gBAAgB,EAAE,EAAE;QACnB,aAAa,CAAC,QAAQ,CAAC,kDAAyB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;QAC9E,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC,CACF,CAAC;AACJ,CAAC;AAVD,oEAUC;AAED,SAAgB,sBAAsB,CACpC,gBAAuC,EACvC,OAAe;IAEf,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;IACnD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AApDD,wDAoDC;AAED,SAAgB,6BAA6B,CAAC,MAAY;IACxD,OAAO,CACL,MAAM,CAAC,yBAAa,CAAC;QACrB,MAAM,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC;QAC/B,MAAM,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAC9D,CAAC;AACJ,CAAC;AAND,sEAMC;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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;;AAAA,wDAiBgC;AAChC,sFAAsF;AACtF,oDAAyE;AACzE,4CAKsB;AACtB,0CAWqB;AACrB,wEAA2E;AAE3E,wCAAiD;AACjD,mDAA6B;AAE7B,SAAgB,kBAAkB,CAAC,eAAgC;IACjE,MAAM,aAAa,GACjB,eAAe,CAAC,gBAAyC,CAAC;IAC5D,MAAM,OAAO,GAAG,uDAA6B,CAAC,eAAe,CAAC,CAAC;IAC/D,aAAa,CAAC,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,OAAO,OAAO,CAAC;AACjB,CAAC;AAND,gDAMC;AAED,SAAgB,wBAAwB,CAAC,GAAe;IACtD,OAAO,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;AACtE,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,aAAoC;IACjE,OAAO,8BAAmB,CAAC,EAAE,KAAK,aAAa,CAAC,QAAQ,CAAC;AAC3D,CAAC;AAFD,wCAEC;AAED,SAAgB,cAAc,CAAI,OAAsC;IACtE,MAAM,GAAG,GAA6B,EAAE,CAAC;IACzC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,wCAOC;AAED,SAAgB,qBAAqB,CAAC,MAAY;IAChD,OAAO;QACL,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;QAChD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC;QAC9C,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;QAC5C,gBAAgB,EAAE,SAAS;QAC3B,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC;QACxC,kBAAkB,EAAE,MAAM,CAAC,wCAA4B,CAAC;QACxD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;KAC7B,CAAC;AACJ,CAAC;AAXD,sDAWC;AAED,SAAgB,eAAe,CAAC,eAAgC;IAC9D,MAAM,gBAAgB,GACpB,eAAe,CAAC,gBAAyC,CAAC;IAC5D,MAAM,GAAG,GAAG,uDAA6B,CAAC,eAAe,CAAC,CAAC;IAC3D,gBAAgB,CAAC,qBAAqB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,CAAC;AACb,CAAC;AAND,0CAMC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,gBAAuC,EACvC,yBAAoD;IAEpD,IAAI,gBAAgB,CAAC,aAAa,EAAE;QAClC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;QACrC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,2CAA2C,CAAC,EACtD,0BAAc,EACd,yBAAa,CAAC,6BAA6B,CAC5C,CACF,CAAC;KACH;IAED,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,sBAAsB,EAAE,CAAC;IACxE,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAC5B,OAAO,MAAM,CAAC,GAAG,CAAC,iBAAG,CAAC,CAAC;KACxB;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAxBD,0DAwBC;AAED,SAAgB,qBAAqB,CACnC,cAAwC;IAExC,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAC1C,0BAAc,EACd,yBAAa,CAAC,gBAAgB,CAC/B,CACF,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,IACE,gBAAgB,KAAK,SAAS;QAC9B,CAAC,CAAC,OAAO,gBAAgB,KAAK,QAAQ,CAAC;QACvC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAC7B;QACA,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,iCAAiC,CAAC,EAC5C,0BAAc,EACd,yBAAa,CAAC,kBAAkB,CACjC,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,gBAAgB,CAAC,CAAC;AAC9B,CAAC;AA5BD,sDA4BC;AAED,SAAgB,aAAa,CAAC,cAAwC;IACpE,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAC1C,UAAU,EACV,yBAAa,CAAC,gBAAgB,CAC/B,CACF,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACtF,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,8CAA8C,CAAC,EACzD,UAAU,EACV,yBAAa,CAAC,UAAU,CACzB,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAtBD,sCAsBC;AAEM,KAAK,UAAU,uCAAuC,CAC3D,kBAA2B,EAC3B,sBAA+C;IAE/C,IAAI,kBAAkB,EAAE;QACtB,MAAM,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;IAExC,OAAO,qBAAqB,CAAC,cAAqD,CAAC,CAAC,OAAO,CACzF,CAAC,gBAAgB,EAAE,EAAE;QACnB,aAAa,CAAC,QAAQ,CAAC,kDAAyB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;QAC9E,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC,CACF,CAAC;AACJ,CAAC;AAVD,oEAUC;AAED,SAAgB,sBAAsB,CACpC,gBAAuC,EACvC,OAAe;IAEf,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;IACnD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AApDD,wDAoDC;AAED,SAAgB,6BAA6B,CAAC,MAAY;IACxD,OAAO,CACL,MAAM,CAAC,yBAAa,CAAC;QACrB,MAAM,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC;QAC/B,MAAM,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAC9D,CAAC;AACJ,CAAC;AAND,sEAMC;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"}

package/build/plugins/solution/fx-solution/v3/addModule.d.ts

@@ -1,6 +1,4 @@
-import { FxError, Json, QTreeNode, Result, v2, Void } from "@microsoft/teamsfx-api";
+import { FxError, Json, QTreeNode, Result, v2, v3 } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForAddModule(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function addModule(ctx: v2.Context, localSettings: Json, inputs: v2.InputsWithProjectPath & {
-    capabilities?: string[];
-}): Promise<Result<Void, FxError>>;
+export declare function addModule(ctx: v2.Context, inputs: v3.SolutionAddModuleInputs, localSettings?: Json): Promise<Result<Json, FxError>>;
 //# sourceMappingURL=addModule.d.ts.map

package/build/plugins/solution/fx-solution/v3/addModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,IAAI,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAIjG,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,SAAS,CAC7B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,aAAa,EAAE,IAAI,EACnB,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC7D,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmBhC"}
+{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAKP,IAAI,EAEJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,SAAS,CAC7B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,uBAAuB,EAClC,aAAa,CAAC,EAAE,IAAI,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiDhC"}

package/build/plugins/solution/fx-solution/v3/addModule.js

@@ -4,20 +4,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModule = exports.getQuestionsForAddModule = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const typedi_1 = require("typedi");
+const scaffolding_1 = require("../debug/scaffolding");
+const question_1 = require("../question");
+const constants_1 = require("./constants");
 const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 async function getQuestionsForAddModule(ctx, inputs) {
     return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(questions_1.selectCapabilitiesQuestion));
 }
 exports.getQuestionsForAddModule = getQuestionsForAddModule;
-async function addModule(ctx, localSettings, inputs) {
+async function addModule(ctx, inputs, localSettings) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const inputCapabilities = inputs.capabilities;
+    // 1. update solution settings
     const module = {
-        capabilities: inputs.capabilities || [],
+        capabilities: inputCapabilities,
     };
     const capSet = new Set();
     solutionSettings.modules.forEach((m) => m.capabilities.forEach((c) => capSet.add(c)));
-    for (const cap of inputs.capabilities || []) {
+    for (const cap of inputCapabilities) {
         if (capSet.has(cap)) {
             return teamsfx_api_1.err(new error_1.CapabilityAlreadyAddedError(cap));
         }
@@ -27,9 +33,26 @@ async function addModule(ctx, localSettings, inputs) {
     }
     solutionSettings.capabilities = Array.from(capSet);
     solutionSettings.modules.push(module);
-    //TODO
-    //call localDebug plugin's scaffold API
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    // 2. scaffold local debug settings
+    const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
+    if (scaffoldLocalDebugSettingsResult.isErr()) {
+        return scaffoldLocalDebugSettingsResult;
+    }
+    // 3. call appStudio.addCapabilities() to update manifest templates
+    if (inputCapabilities.length > 0) {
+        const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+        const manifestInputs = [];
+        if (inputCapabilities.includes(question_1.TabOptionItem.id))
+            manifestInputs.push({ name: "staticTab" });
+        if (inputCapabilities.includes(question_1.BotOptionItem.id))
+            manifestInputs.push({ name: "Bot" });
+        if (inputCapabilities.includes(question_1.MessageExtensionItem.id))
+            manifestInputs.push({ name: "MessageExtension" });
+        const addRes = await appStudio.addCapabilities(ctx, inputs, manifestInputs);
+        if (addRes.isErr())
+            return teamsfx_api_1.err(addRes.error);
+    }
+    return teamsfx_api_1.ok(scaffoldLocalDebugSettingsResult.value);
 }
 exports.addModule = addModule;
 //# sourceMappingURL=addModule.js.map

package/build/plugins/solution/fx-solution/v3/addModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAiG;AACjG,mCAAsD;AACtD,qDAAmE;AAE5D,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAgC;IAEhC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,sCAA0B,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,4DAKC;AACM,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,aAAmB,EACnB,MAA8D;IAE9D,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;KACxC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE;QAC3C,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,OAAO,iBAAG,CAAC,IAAI,mCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM;IACN,uCAAuC;IACvC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAvBD,8BAuBC"}
+{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAagC;AAChC,mCAAmC;AAEnC,sDAAkE;AAClE,0CAAiF;AACjF,2CAAyD;AACzD,mCAAsD;AACtD,qDAAmE;AAE5D,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAgC;IAEhC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,sCAA0B,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,4DAKC;AACM,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,MAAkC,EAClC,aAAoB;IAEpB,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC;IAC9C,8BAA8B;IAC9B,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,iBAAiB;KAChC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;QACnC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,OAAO,iBAAG,CAAC,IAAI,mCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtC,mCAAmC;IACnC,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CACvE,GAAG,EACH,MAAM,EACN,aAAa,CACd,CAAC;IACF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;QAC5C,OAAO,gCAAgC,CAAC;KACzC;IAED,mEAAmE;IACnE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;QACzF,MAAM,cAAc,GAQd,EAAE,CAAC;QACT,IAAI,iBAAiB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7F,IAAI,iBAAiB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvF,IAAI,iBAAiB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC;YACrD,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC9C;IACD,OAAO,gBAAE,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AArDD,8BAqDC"}

package/build/plugins/solution/fx-solution/v3/addResource.d.ts

@@ -1,37 +1,29 @@
 import { AzureAccountProvider, FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
-export declare class AzureStoragePlugin implements v3.ResourcePlugin {
-    resourceType: string;
-    description: string;
-    name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
-    provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
-    deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
-}
 export declare class AzureBotPlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare class AzureWebAppPlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare class SPFxResourcePlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare function getQuestionsForAddResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function addResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    module?: string;
-    resource?: string;
-}): Promise<Result<Void, FxError>>;
+export declare function addResource(ctx: v2.Context, inputs: v3.SolutionAddResourceInputs): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=addResource.d.ts.map

package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/addResource.js

@@ -2,9 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = exports.AzureStoragePlugin = void 0;
+exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
 const typedi_1 = require("typedi");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_1 = require("./constants");
@@ -12,51 +13,9 @@ const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 const utils_1 = require("./utils");
 const error_2 = require("../../utils/error");
-let AzureStoragePlugin = class AzureStoragePlugin {
-    constructor() {
-        this.resourceType = "Azure Storage";
-        this.description = "Azure Storage";
-        this.name = constants_1.BuiltInResourcePluginNames.storage;
-    }
-    async generateResourceTemplate(ctx, inputs) {
-        return teamsfx_api_1.ok({
-            kind: "bicep",
-            template: {
-                Provision: {
-                    Orchestration: "Orchestration",
-                    Reference: {
-                        endpoint: "provisionOutputs.azureStorageOutput.value.endpoint",
-                        domain: "provisionOutputs.azureStorageOutput.value.domain",
-                    },
-                    Modules: {
-                        azureStorage: "",
-                    },
-                },
-                Parameters: {
-                    azureStorageK1: "v1",
-                },
-            },
-        });
-    }
-    async provisionResource(ctx, inputs, envInfo, tokenProvider) {
-        const config = {
-            domain: "huajie1214dev35e42dtab.z19.web.core.windows.net",
-            endpoint: "https://huajie1214dev35e42dtab.z19.web.core.windows.net",
-            storageResourceId: "/subscriptions/63f43cd3-ab63-429d-80ad-950ec8359724/resourceGroups/fullcap-dev-rg/providers/Microsoft.Storage/storageAccounts/huajie1214dev35e42dtab",
-        };
-        return teamsfx_api_1.ok(config);
-    }
-    async deploy(ctx, inputs, envInfo, tokenProvider) {
-        ctx.logProvider.info(`fx-resource-azure-storage deploy success!`);
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-};
-AzureStoragePlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_1.BuiltInResourcePluginNames.storage)
-], AzureStoragePlugin);
-exports.AzureStoragePlugin = AzureStoragePlugin;
 let AzureBotPlugin = class AzureBotPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Bot";
         this.description = "Azure Bot";
         this.name = constants_1.BuiltInResourcePluginNames.bot;
@@ -107,6 +66,7 @@ AzureBotPlugin = tslib_1.__decorate([
 exports.AzureBotPlugin = AzureBotPlugin;
 let AzureWebAppPlugin = class AzureWebAppPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Web App";
         this.description = "Azure Web App";
         this.name = constants_1.BuiltInResourcePluginNames.webApp;
@@ -149,6 +109,7 @@ AzureWebAppPlugin = tslib_1.__decorate([
 exports.AzureWebAppPlugin = AzureWebAppPlugin;
 let SPFxResourcePlugin = class SPFxResourcePlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "SPFx resource";
         this.description = "SPFx resource";
         this.name = constants_1.BuiltInResourcePluginNames.spfx;
@@ -163,11 +124,7 @@ SPFxResourcePlugin = tslib_1.__decorate([
 ], SPFxResourcePlugin);
 exports.SPFxResourcePlugin = SPFxResourcePlugin;
 function getAllResourcePlugins() {
-    return [
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.bot),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
-    ];
+    return [typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.storage)];
 }
 async function getQuestionsForAddResource(ctx, inputs) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
@@ -194,6 +151,8 @@ async function addResource(ctx, inputs) {
         return teamsfx_api_1.err(new error_2.InvalidInputError(inputs, "inputs.resource undefined"));
     }
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { existingResources: originalSettings.activeResourcePlugins });
     if (inputs.module !== undefined) {
         const module = utils_1.getModule(solutionSettings, inputs.module);
         if (module) {
@@ -215,10 +174,18 @@ async function addResource(ctx, inputs) {
     addedResourceNames.forEach((s) => allResourceNames.add(s));
     existingResourceNames.forEach((s) => allResourceNames.add(s));
     solutionSettings.activeResourcePlugins = Array.from(allResourceNames);
+    // read manifest
+    const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+    const manifestRes = await appStudio.loadManifest(ctx, inputs);
+    if (manifestRes.isErr()) {
+        return teamsfx_api_1.err(manifestRes.error);
+    }
+    const manifest = manifestRes.value;
+    const contextWithManifest = Object.assign(Object.assign({}, ctx), { appManifest: manifest });
     //call arm module to generate arm templates
     const activatedPlugins = solutionSettings.activeResourcePlugins.map((n) => typedi_1.Container.get(n));
     const addedPlugins = Array.from(addedResourceNames).map((n) => typedi_1.Container.get(n));
-    const armRes = await arm_1.default.generateArmTemplate(ctx, inputs, activatedPlugins, addedPlugins);
+    const armRes = await arm_1.default.generateArmTemplate(contextWithManifest, inputsNew, activatedPlugins, addedPlugins);
     if (armRes.isErr()) {
         return teamsfx_api_1.err(armRes.error);
     }
@@ -227,13 +194,18 @@ async function addResource(ctx, inputs) {
         const plugin = typedi_1.Container.get(pluginName);
         if (addedResourceNames.has(pluginName) && !existingResourceNames.has(pluginName)) {
             if (plugin.addResource) {
-                const res = await plugin.addResource(ctx, inputs);
+                const res = await plugin.addResource(contextWithManifest, inputsNew);
                 if (res.isErr()) {
                     return teamsfx_api_1.err(res.error);
                 }
             }
         }
     }
+    // write manifest
+    const writeRes = await appStudio.saveManifest(ctx, inputs, manifest);
+    if (writeRes.isErr()) {
+        return teamsfx_api_1.err(writeRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.addResource = addResource;