@microsoft/teamsfx-core 1.4.0 → 1.4.1-alpha.313131ea.0

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

@@ -20,13 +20,14 @@ function getAllFeaturePlugins() {
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.keyVault),
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.identity),
         typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.sql),
+        typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.spfx),
     ];
 }
 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.selectSingleFeatureQuestion);
+    const featureNode = new teamsfx_api_1.QTreeNode(questions_1.selectMultipleFeaturesQuestion);
     if (!((_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.programmingLanguage)) {
         const programmingLanguage = new teamsfx_api_1.QTreeNode(question_1.ProgrammingLanguageQuestion);
         node.addChild(programmingLanguage);
@@ -42,37 +43,34 @@ async function getQuestionsForAddFeature(ctx, inputs) {
             if (childNode.isErr())
                 return teamsfx_api_1.err(childNode.error);
             if (childNode.value) {
-                childNode.value.condition = { equals: plugin.name };
+                childNode.value.condition = { contains: plugin.name };
                 featureNode.addChild(childNode.value);
             }
         }
     }
-    questions_1.selectSingleFeatureQuestion.staticOptions = staticOptions;
+    questions_1.selectMultipleFeaturesQuestion.staticOptions = staticOptions;
     node.addChild(featureNode);
     return teamsfx_api_1.ok(node);
 }
 exports.getQuestionsForAddFeature = getQuestionsForAddFeature;
 class DefaultManifestProvider {
-    async loadManifest(ctx, inputs) {
+    async updateCapability(ctx, inputs, capability) {
         const appStudioV3 = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.appStudio);
-        const res = await appStudioV3.loadManifest(ctx, inputs);
-        if (res.isErr())
-            return teamsfx_api_1.err(res.error);
-        return teamsfx_api_1.ok(res.value.remote);
+        return await appStudioV3.updateCapability(ctx, inputs, capability);
     }
-    async saveManifest(ctx, inputs, manifest) {
+    async deleteCapability(ctx, inputs, capability) {
         const appStudioV3 = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.appStudio);
-        const res = await appStudioV3.saveManifest(ctx, inputs, {
-            local: manifest,
-            remote: manifest,
-        });
-        if (res.isErr())
-            return teamsfx_api_1.err(res.error);
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+        return await appStudioV3.deleteCapability(ctx, inputs, capability);
+    }
+    async capabilityExceedLimit(ctx, inputs, capability) {
+        const appStudioV3 = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.appStudio);
+        return await appStudioV3.capabilityExceedLimit(ctx, inputs, capability);
     }
     async addCapabilities(ctx, inputs, capabilities) {
         const appStudioV3 = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.appStudio);
-        const res = await appStudioV3.addCapabilities(ctx, inputs, []);
+        const res = await appStudioV3.addCapabilities(ctx, inputs, capabilities);
+        if (res.isErr())
+            return teamsfx_api_1.err(res.error);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
 }
@@ -87,20 +85,24 @@ async function addFeature(ctx, inputs, telemetryProps) {
         existingResources.add(p);
         allResources.add(p);
     });
-    allResources.add(inputs.feature);
+    inputs.features.forEach((f) => {
+        allResources.add(f);
+    });
     const resolveRes = await resolveResourceDependencies(ctx, inputs, allResources);
     if (resolveRes.isErr())
         return teamsfx_api_1.err(resolveRes.error);
-    const contextWithManifestProvider = Object.assign(Object.assign({}, ctx), { appManifestProvider: new DefaultManifestProvider() });
-    for (const resource of allResources.values()) {
-        if (!existingResources.has(resource) || resource === inputs.feature) {
-            const armInputs = Object.assign(Object.assign({}, inputs), { feature: resource });
-            const generateArmRes = await arm_1.default.addFeature(contextWithManifestProvider, armInputs);
-            if (generateArmRes.isErr()) {
-                return teamsfx_api_1.err(generateArmRes.error);
-            }
+    const existingPluginNames = Array.from(existingResources);
+    const addedPluginNames = [];
+    for (const pluginName of allResources.values()) {
+        if (!existingResources.has(pluginName)) {
+            addedPluginNames.push(pluginName);
         }
     }
+    const contextWithManifestProvider = Object.assign(Object.assign({}, ctx), { appManifestProvider: new DefaultManifestProvider() });
+    const addFeatureRes = await arm_1.default.addFeature(contextWithManifestProvider, inputs, addedPluginNames, existingPluginNames);
+    if (addFeatureRes.isErr()) {
+        return teamsfx_api_1.err(addFeatureRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.addFeature = addFeature;

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

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

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

@@ -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,EAEJ,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,CAwBjD;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"}
+{"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"}

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

@@ -17,24 +17,34 @@ async function getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider) {
     if (pluginNames.length === 0)
         return teamsfx_api_1.ok(undefined);
     const rootNode = new teamsfx_api_1.QTreeNode(questions_1.selectMultiPluginsQuestion);
+    const deployOptions = [];
+    const pluginPrefix = "fx-resource-";
     for (const pluginName of pluginNames) {
         if (pluginName) {
             const plugin = typedi_1.Container.get(pluginName);
-            if (plugin.deploy && plugin.getQuestionsForDeploy) {
-                const res = await plugin.getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider);
-                if (res.isErr()) {
-                    return res;
-                }
-                if (res.value) {
-                    const node = res.value;
-                    if (node && node.data) {
-                        node.condition = { contains: pluginName };
-                        rootNode.addChild(node);
+            if (plugin.deploy) {
+                deployOptions.push({
+                    id: pluginName,
+                    label: plugin.displayName || pluginName,
+                    cliName: plugin.name.replace(pluginPrefix, ""),
+                });
+                if (plugin.getQuestionsForDeploy) {
+                    const res = await plugin.getQuestionsForDeploy(ctx, inputs, envInfo, tokenProvider);
+                    if (res.isErr()) {
+                        return res;
+                    }
+                    if (res.value) {
+                        const node = res.value;
+                        if (node && node.data) {
+                            node.condition = { contains: pluginName };
+                            rootNode.addChild(node);
+                        }
                     }
                 }
             }
         }
     }
+    questions_1.selectMultiPluginsQuestion.staticOptions = deployOptions;
     return teamsfx_api_1.ok(rootNode);
 }
 exports.getQuestionsForDeploy = getQuestionsForDeploy;
@@ -52,7 +62,7 @@ async function deploy(ctx, inputs, envInfo, tokenProvider, telemetryProps) {
             taskName: "deploy",
             thunk: () => {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                return plugin.deploy(ctx, inputs, envInfo, tokenProvider.azureAccountProvider);
+                return plugin.deploy(ctx, inputs, envInfo, tokenProvider);
             },
         };
     });

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

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

@@ -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;AAsBhC,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,CA2MxC;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"}
+{"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;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,CAqNxC;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"}

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

@@ -16,6 +16,7 @@ const tools_1 = require("../../../../common/tools");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_2 = require("../constants");
 const provisionLocal_1 = require("../debug/provisionLocal");
+const question_1 = require("../question");
 const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
 const executor_1 = require("../v2/executor");
 const constants_3 = require("./constants");
@@ -69,8 +70,10 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider, telemetry
     if (registerTeamsAppRes.isErr())
         return teamsfx_api_1.err(registerTeamsAppRes.error);
     const teamsAppId = registerTeamsAppRes.value;
+    teamsAppResource.teamsAppId = teamsAppId;
     solutionGlobalVars_1.solutionGlobalVars.TeamsAppId = teamsAppId;
-    if (solutionSetting) {
+    if (solutionSetting &&
+        !ctx.projectSetting.solutionSettings.capabilities.includes(question_1.TabSPFxItem.id)) {
         if (envInfo.envName === "local") {
             // TODO for local debug
             const debugProvisionResult = await provisionLocal_1.setupLocalDebugSettings(ctx, inputs, envInfo);
@@ -159,8 +162,7 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider, telemetry
         }
         else {
             const url = tools_1.getResourceGroupInPortal(envStates.solution.subscriptionId, envStates.solution.tenantId, envStates.solution.resourceGroupName);
-            const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
-            ctx.logProvider.info(msg);
+            const msg = tools_1.getStrings().solution.ProvisionSuccessAzure;
             if (url) {
                 const title = "View Provisioned Resources";
                 ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
@@ -180,6 +182,11 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider, telemetry
     if (updateTeamsAppRes.isErr()) {
         return teamsfx_api_1.err(updateTeamsAppRes.error);
     }
+    if (envInfo.envName !== "local") {
+        const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
+        ctx.userInteraction.showMessage("info", msg, false);
+        ctx.logProvider.info(msg);
+    }
     return teamsfx_api_1.ok(envInfo);
 }
 exports.provisionResources = provisionResources;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"userTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,IAAI,EACJ,OAAO,EACP,MAAM,EAEN,IAAI,EAIJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAuBhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,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,CAQjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAgDjD;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,GAAG,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAoDhC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4ChC"}
+{"version":3,"file":"userTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,IAAI,EACJ,OAAO,EACP,MAAM,EAEN,IAAI,EAIJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAuBhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,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,CAQjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAoDjD;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,GAAG,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkDhC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA2ChC"}

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

@@ -37,10 +37,10 @@ async function getQuestionsForAddResource(ctx, inputs) {
         if (!settings) {
             return teamsfx_api_1.err(new core_1.OperationNotSupportedForExistingAppError("addResource"));
         }
-        const alreadyHaveFunction = settings.azureResources.includes(question_1.AzureResourceFunction.id);
-        const alreadyHaveSQL = settings.azureResources.includes(question_1.AzureResourceSQL.id);
-        const alreadyHaveAPIM = settings.azureResources.includes(question_1.AzureResourceApim.id);
-        const alreadyHaveKeyVault = settings.azureResources.includes(question_1.AzureResourceKeyVault.id);
+        const alreadyHaveFunction = settings.activeResourcePlugins.includes(constants_2.BuiltInFeaturePluginNames.function);
+        const alreadyHaveSQL = settings.activeResourcePlugins.includes(constants_2.BuiltInFeaturePluginNames.sql);
+        const alreadyHaveAPIM = settings.activeResourcePlugins.includes(constants_2.BuiltInFeaturePluginNames.apim);
+        const alreadyHaveKeyVault = settings.activeResourcePlugins.includes(constants_2.BuiltInFeaturePluginNames.keyVault);
         addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHaveKeyVault);
         const canProceed = executeUserTask_1.canAddResource(ctx.projectSetting, ctx.telemetryReporter);
         if (canProceed.isErr()) {
@@ -84,41 +84,38 @@ async function addCapability(ctx, inputs, telemetryProps) {
         telemetryProps[constants_1.SolutionTelemetryProperty.Capabilities] = capabilitiesAnswer.join(";");
     }
     const vsProject = core_1.isVSProject(ctx.projectSetting);
+    const features = [constants_2.BuiltInFeaturePluginNames.aad]; // AAD is added by default
     if (vsProject) {
-        const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, feature: constants_2.BuiltInFeaturePluginNames.dotnet });
-        const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
-        if (addFeatureRes.isErr())
-            return teamsfx_api_1.err(addFeatureRes.error);
+        features.push(constants_2.BuiltInFeaturePluginNames.dotnet);
     }
     else {
-        for (const capability of capabilitiesAnswer) {
-            let resourcePluginName;
-            if (capability === question_1.TabOptionItem.id) {
-                resourcePluginName = constants_2.BuiltInFeaturePluginNames.frontend;
-            }
-            else if (capability === question_1.BotOptionItem.id || capability === question_1.MessageExtensionItem.id) {
-                resourcePluginName = constants_2.BuiltInFeaturePluginNames.bot;
-            }
-            if (resourcePluginName) {
-                const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, feature: resourcePluginName });
-                const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
-                if (addFeatureRes.isErr())
-                    return teamsfx_api_1.err(addFeatureRes.error);
-            }
+        if (capabilitiesAnswer.includes(question_1.TabOptionItem.id)) {
+            features.push(constants_2.BuiltInFeaturePluginNames.frontend);
+        }
+        if (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
+            capabilitiesAnswer.includes(question_1.MessageExtensionItem.id)) {
+            features.push(constants_2.BuiltInFeaturePluginNames.bot);
         }
     }
-    if (capabilitiesAnswer.length > 0) {
-        const addNames = capabilitiesAnswer.map((c) => `'${c}'`).join(" and ");
-        const single = capabilitiesAnswer.length === 1;
-        const template = inputs.platform === teamsfx_api_1.Platform.CLI
-            ? single
-                ? tools_1.getStrings().solution.addCapability.AddCapabilityNoticeForCli
-                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNoticeForCli
-            : single
-                ? tools_1.getStrings().solution.addCapability.AddCapabilityNotice
-                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNotice;
-        const msg = util.format(template, addNames);
-        ctx.userInteraction.showMessage("info", msg, false);
+    if (features.length > 0) {
+        const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, features: features });
+        const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
+        if (addFeatureRes.isErr()) {
+            return teamsfx_api_1.err(addFeatureRes.error);
+        }
+        if (capabilitiesAnswer.length > 0) {
+            const addNames = capabilitiesAnswer.map((c) => `'${c}'`).join(" and ");
+            const single = capabilitiesAnswer.length === 1;
+            const template = inputs.platform === teamsfx_api_1.Platform.CLI
+                ? single
+                    ? tools_1.getStrings().solution.addCapability.AddCapabilityNoticeForCli
+                    : tools_1.getStrings().solution.addCapability.AddCapabilitiesNoticeForCli
+                : single
+                    ? tools_1.getStrings().solution.addCapability.AddCapabilityNotice
+                    : tools_1.getStrings().solution.addCapability.AddCapabilitiesNotice;
+            const msg = util.format(template, addNames);
+            ctx.userInteraction.showMessage("info", msg, false);
+        }
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
@@ -132,38 +129,37 @@ async function addResource(ctx, inputs, telemetryProps) {
     if (telemetryProps) {
         telemetryProps[constants_1.SolutionTelemetryProperty.Resources] = addResourcesAnswer.join(";");
     }
+    const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, features: [] });
     for (const resource of addResourcesAnswer) {
-        let resourcePluginName;
         if (resource === question_1.AzureResourceSQL.id) {
-            resourcePluginName = constants_2.BuiltInFeaturePluginNames.sql;
+            addFeatureInputs.features.push(constants_2.BuiltInFeaturePluginNames.sql);
         }
         else if (resource === question_1.AzureResourceApim.id) {
-            resourcePluginName = constants_2.BuiltInFeaturePluginNames.apim;
+            addFeatureInputs.features.push(constants_2.BuiltInFeaturePluginNames.apim);
         }
         else if (resource === question_1.AzureResourceFunction.id) {
-            resourcePluginName = constants_2.BuiltInFeaturePluginNames.function;
+            addFeatureInputs.features.push(constants_2.BuiltInFeaturePluginNames.function);
         }
         else if (resource === question_1.AzureResourceKeyVault.id) {
-            resourcePluginName = constants_2.BuiltInFeaturePluginNames.keyVault;
-        }
-        if (resourcePluginName) {
-            const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, feature: resourcePluginName });
-            const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
-            if (addFeatureRes.isErr())
-                return teamsfx_api_1.err(addFeatureRes.error);
+            addFeatureInputs.features.push(constants_2.BuiltInFeaturePluginNames.keyVault);
         }
     }
-    if (addResourcesAnswer.length > 0) {
-        const addNames = addResourcesAnswer.join(" and ");
-        const single = addResourcesAnswer.length === 1;
-        const template = inputs.platform === teamsfx_api_1.Platform.CLI
-            ? single
-                ? tools_1.getStrings().solution.addResource.AddResourceNoticeForCli
-                : tools_1.getStrings().solution.addResource.AddResourcesNoticeForCli
-            : single
-                ? tools_1.getStrings().solution.addResource.AddResourceNotice
-                : tools_1.getStrings().solution.addResource.AddResourcesNotice;
-        ctx.userInteraction.showMessage("info", util.format(template, addNames), false);
+    if (addFeatureInputs.features.length > 0) {
+        const addFeatureRes = await addFeature_1.addFeature(ctx, addFeatureInputs);
+        if (addFeatureRes.isErr())
+            return teamsfx_api_1.err(addFeatureRes.error);
+        if (addResourcesAnswer.length > 0) {
+            const addNames = addResourcesAnswer.join(" and ");
+            const single = addResourcesAnswer.length === 1;
+            const template = inputs.platform === teamsfx_api_1.Platform.CLI
+                ? single
+                    ? tools_1.getStrings().solution.addResource.AddResourceNoticeForCli
+                    : tools_1.getStrings().solution.addResource.AddResourcesNoticeForCli
+                : single
+                    ? tools_1.getStrings().solution.addResource.AddResourceNotice
+                    : tools_1.getStrings().solution.addResource.AddResourcesNotice;
+            ctx.userInteraction.showMessage("info", util.format(template, addNames), false);
+        }
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }

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

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

package/build/plugins/solution/spfx-solution/addFeature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addFeature.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAEN,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,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,CAUjD;AAED,wBAAsB,UAAU,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,wBAAwB,GAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAWhC;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}
+{"version":3,"file":"addFeature.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAEN,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,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,CAUjD;AAED,wBAAsB,UAAU,CAC9B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,wBAAwB,GAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}

package/build/plugins/solution/spfx-solution/addFeature.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishApplication = exports.addFeature = exports.getQuestionsForAddFeature = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const typedi_1 = require("typedi");
-const addFeature_1 = require("../fx-solution/v3/addFeature");
 const constants_1 = require("../fx-solution/v3/constants");
 async function getQuestionsForAddFeature(ctx, inputs) {
     const plugin = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.spfx);
@@ -21,13 +20,6 @@ async function getQuestionsForAddFeature(ctx, inputs) {
 }
 exports.getQuestionsForAddFeature = getQuestionsForAddFeature;
 async function addFeature(ctx, inputs) {
-    const plugin = typedi_1.Container.get(constants_1.BuiltInFeaturePluginNames.spfx);
-    if (plugin.addFeature) {
-        const contextWithManifestProvider = Object.assign(Object.assign({}, ctx), { appManifestProvider: new addFeature_1.DefaultManifestProvider() });
-        const res = await plugin.addFeature(contextWithManifestProvider, inputs);
-        if (res.isErr())
-            return teamsfx_api_1.err(res.error);
-    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.addFeature = addFeature;

package/build/plugins/solution/spfx-solution/addFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAWgC;AAChC,mCAAmC;AACnC,6DAAuE;AACvE,2DAAwE;AAEjE,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;IAEhC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAmB,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,yBAAyB,EAAE;QACpC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACtE,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,KAAK,EAAE;YACnB,OAAO,gBAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC5B;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAbD,8DAaC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAe,EACf,MAAmC;IAEnC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAmB,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,MAAM,2BAA2B,mCAC5B,GAAG,KACN,mBAAmB,EAAE,IAAI,oCAAuB,EAAE,GACnD,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;QACzE,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACxC;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAdD,gCAcC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;IAErC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC"}
+{"version":3,"file":"addFeature.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addFeature.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAWgC;AAChC,mCAAmC;AAEnC,2DAAwE;AAEjE,KAAK,UAAU,yBAAyB,CAC7C,GAAe,EACf,MAAgC;IAEhC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAmB,qCAAyB,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,yBAAyB,EAAE;QACpC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACtE,IAAI,SAAS,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,KAAK,EAAE;YACnB,OAAO,gBAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC5B;KACF;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAbD,8DAaC;AAEM,KAAK,UAAU,UAAU,CAC9B,GAAe,EACf,MAAmC;IAEnC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AALD,gCAKC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;IAErC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC"}

package/build/plugins/solution/utils/questions.d.ts

@@ -1,10 +1,10 @@
-import { MultiSelectQuestion, SingleSelectQuestion } from "@microsoft/teamsfx-api";
+import { MultiSelectQuestion } from "@microsoft/teamsfx-api";
 export declare enum SolutionV3QuestionNames {
     capabilities = "capabilities",
-    feature = "feature",
+    features = "features",
     plugins = "plugins"
 }
-export declare const selectSingleFeatureQuestion: SingleSelectQuestion;
+export declare const selectMultipleFeaturesQuestion: MultiSelectQuestion;
 export declare const selectMultiPluginsQuestion: MultiSelectQuestion;
 export declare const selectCapabilitiesQuestion: MultiSelectQuestion;
 //# sourceMappingURL=questions.d.ts.map

package/build/plugins/solution/utils/questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/utils/questions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnF,oBAAY,uBAAuB;IACjC,YAAY,iBAAiB;IAC7B,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,2BAA2B,EAAE,oBAKzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAKxC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC"}
+{"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/utils/questions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAwB,MAAM,wBAAwB,CAAC;AAGnF,oBAAY,uBAAuB;IACjC,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,8BAA8B,EAAE,mBAK5C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAKxC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC"}