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

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

@@ -2,53 +2,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scaffold = exports.getQuestionsForScaffold = exports.SPFxScaffoldPlugin = exports.BlazorScaffoldPlugin = exports.BotScaffoldPlugin = exports.ReactTabScaffoldPlugin = void 0;
+exports.scaffold = exports.getQuestionsForScaffold = exports.SPFxScaffoldPlugin = exports.BlazorScaffoldPlugin = exports.BotScaffoldPlugin = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
-const constants_1 = require("./constants");
+const error_1 = require("../../utils/error");
 const questions_1 = require("../../utils/questions");
+const scaffolding_1 = require("../debug/scaffolding");
+const constants_1 = require("./constants");
 const utils_1 = require("./utils");
-const error_1 = require("../../utils/error");
-let ReactTabScaffoldPlugin = class ReactTabScaffoldPlugin {
-    constructor() {
-        this.name = constants_1.BuiltInScaffoldPluginNames.tab;
-    }
-    async getTemplates(ctx, inputs) {
-        return teamsfx_api_1.ok([
-            {
-                name: "ReactTab_JS",
-                language: "javascript",
-                description: "ReactTab Javascript",
-            },
-            {
-                name: "ReactTab_TS",
-                language: "typescript",
-                description: "ReactTab Typescript",
-            },
-        ]);
-    }
-    async scaffold(ctx, inputs) {
-        ctx.logProvider.info("fx-scaffold-react-tab:scaffold");
-        if (!inputs.test)
-            await fs_extra_1.default.ensureDir(path.join(inputs.projectPath, "tabs"));
-        const solutionSettings = ctx.projectSetting.solutionSettings;
-        const module = utils_1.getModule(solutionSettings, inputs.module);
-        if (module) {
-            module.dir = "tabs";
-            module.deployType = "folder";
-        }
-        return teamsfx_api_1.ok(undefined);
-    }
-};
-ReactTabScaffoldPlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_1.BuiltInScaffoldPluginNames.tab)
-], ReactTabScaffoldPlugin);
-exports.ReactTabScaffoldPlugin = ReactTabScaffoldPlugin;
 let BotScaffoldPlugin = class BotScaffoldPlugin {
     constructor() {
+        this.type = "scaffold";
         this.name = constants_1.BuiltInScaffoldPluginNames.bot;
     }
     async getTemplates(ctx, inputs) {
@@ -84,6 +51,7 @@ BotScaffoldPlugin = tslib_1.__decorate([
 exports.BotScaffoldPlugin = BotScaffoldPlugin;
 let BlazorScaffoldPlugin = class BlazorScaffoldPlugin {
     constructor() {
+        this.type = "scaffold";
         this.name = constants_1.BuiltInScaffoldPluginNames.blazor;
     }
     async getTemplates(ctx, inputs) {
@@ -124,6 +92,7 @@ BlazorScaffoldPlugin = tslib_1.__decorate([
 exports.BlazorScaffoldPlugin = BlazorScaffoldPlugin;
 let SPFxScaffoldPlugin = class SPFxScaffoldPlugin {
     constructor() {
+        this.type = "scaffold";
         this.name = constants_1.BuiltInScaffoldPluginNames.spfx;
     }
     async getTemplates(ctx, inputs) {
@@ -209,7 +178,7 @@ async function getQuestionsForScaffold(ctx, inputs) {
     return teamsfx_api_1.ok(node);
 }
 exports.getQuestionsForScaffold = getQuestionsForScaffold;
-async function scaffold(ctx, inputs) {
+async function scaffold(ctx, inputs, localSettings) {
     if (!inputs.template) {
         return teamsfx_api_1.err(new error_1.InvalidInputError(inputs));
     }
@@ -222,19 +191,28 @@ async function scaffold(ctx, inputs) {
     const templateName = data.templateName;
     const plugin = typedi_1.Container.get(pluginName);
     const pluginInputs = Object.assign(Object.assign({}, inputs), { template: templateName });
-    const res = await plugin.scaffold(ctx, pluginInputs);
-    if (res.isErr()) {
-        return teamsfx_api_1.err(res.error);
-    }
-    const manifest = [];
-    if (res.value) {
-        manifest.push(res.value);
-    }
-    inputs.manifest = manifest;
-    //TODO
-    // //call appstudio.scaffold() API
-    // const appstudioPlugin = Container.get<v3.ScaffoldPlugin>(BuiltInResourcePluginNames.AppStudio);
-    // await appstudioPlugin.scaffold(ctx, pluginInputs);
+    // 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);
+    }
+    // scaffold
+    const manifest = manifestRes.value;
+    const contextWithManifest = Object.assign(Object.assign({}, ctx), { appManifest: manifest });
+    const scaffoldRes = await plugin.scaffold(contextWithManifest, pluginInputs);
+    if (scaffoldRes.isErr()) {
+        return teamsfx_api_1.err(scaffoldRes.error);
+    }
+    // write manifest
+    const writeRes = await appStudio.saveManifest(ctx, inputs, manifest);
+    if (writeRes.isErr()) {
+        return teamsfx_api_1.err(writeRes.error);
+    }
+    const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
+    if (scaffoldLocalDebugSettingsResult.isErr()) {
+        return scaffoldLocalDebugSettingsResult;
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.scaffold = scaffold;

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAYgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,mCAA4C;AAC5C,2CAAyD;AACzD,qDAG+B;AAC/B,mCAAoC;AACpC,6CAAsD;AAEtD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QAgCE,SAAI,GAAG,sCAA0B,CAAC,GAAG,CAAC;IACxC,CAAC;IAhCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,qBAAqB;aACnC;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,qBAAqB;aACnC;SACF,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC;SAC9B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAjCY,sBAAsB;IADlC,gBAAO,CAAC,sCAA0B,CAAC,GAAG,CAAC;GAC3B,sBAAsB,CAiClC;AAjCY,wDAAsB;AAoCnC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QAiCE,SAAI,GAAG,sCAA0B,CAAC,GAAG,CAAC;IACxC,CAAC;IAjCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,cAAc;aAC5B;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,cAAc;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC;YACnB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAlCY,iBAAiB;IAD7B,gBAAO,CAAC,sCAA0B,CAAC,GAAG,CAAC;GAC3B,iBAAiB,CAkC7B;AAlCY,8CAAiB;AAqC9B,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QAsCE,SAAI,GAAG,sCAA0B,CAAC,MAAM,CAAC;IAC3C,CAAC;IAtCC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,gBAAgB;aAC9B;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC;YACtB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AAvCY,oBAAoB;IADhC,gBAAO,CAAC,sCAA0B,CAAC,MAAM,CAAC;GAC9B,oBAAoB,CAuChC;AAvCY,oDAAoB;AA0CjC,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QA4BE,SAAI,GAAG,sCAA0B,CAAC,IAAI,CAAC;IACzC,CAAC;IA5BC,KAAK,CAAC,YAAY,CAChB,GAAe,EACf,MAAc;QAEd,OAAO,gBAAE,CAAC;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,YAAY;gBACtB,WAAW,EAAE,UAAU;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAe,EACf,MAA+B;QAE/B,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;QAC3F,MAAM,MAAM,GAAG,iBAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;SAC3B;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CAEF,CAAA;AA7BY,kBAAkB;IAD9B,gBAAO,CAAC,sCAA0B,CAAC,IAAI,CAAC;GAC5B,kBAAkB,CA6B9B;AA7BY,gDAAkB;AA+B/B,SAAS,qBAAqB;IAC5B,OAAO;QACL,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,MAAM,CAAC;QACnE,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,GAAG,CAAC;QAChE,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,GAAG,CAAC;KACjE,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,MAAM,UAAU,GAAG,0CAA8B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;KAC3B;IACD,MAAM,YAAY,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IACnE,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QACpC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QACD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE;YAC5C,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACrC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,GAAG;gBAC/C,MAAM,EAAE,QAAQ,CAAC,WAAW;gBAC5B,IAAI,EAAE;oBACJ,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC5B;aACF,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,UAAU,CAAC,SAAS,GAAG;wBACrB,SAAS,EAAE,KAAK,EAAE,KAAiB,EAAE,MAAe,EAA+B,EAAE;4BACnF,IAAI,KAAK,CAAC,IAAI,EAAE;gCACd,IAAK,KAAK,CAAC,IAAY,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI;oCAAE,OAAO,SAAS,CAAC;6BACtE;4BACD,OAAO,EAAE,CAAC;wBACZ,CAAC;qBACF,CAAC;oBACF,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBACnC;aACF;SACF;KACF;IACD,0CAA8B,CAAC,aAAa,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC5B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAlDD,0DAkDC;AACM,KAAK,UAAU,QAAQ,CAC5B,GAAe,EACf,MAA6E;IAE7E,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,OAAO,iBAAG,CAAC,IAAI,yBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;KAC3C;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,iBAAG,CAAC,IAAI,yBAAiB,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC,CAAC;KACzE;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAoD,CAAC;IAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACvC,MAAM,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAoB,UAAU,CAAC,CAAC;IAC5D,MAAM,YAAY,mCACb,MAAM,KACT,QAAQ,EAAE,YAAY,GACvB,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACrD,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;QACf,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACvB;IACD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,MAAM;IACN,kCAAkC;IAClC,kGAAkG;IAClG,qDAAqD;IACrD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAjCD,4BAiCC"}
+{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/scaffold.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/spfx-solution/addModule.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAM,MAAM,EAAE,EAAE,EAAM,IAAI,EAAO,MAAM,wBAAwB,CAAC;AAGtF,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,CAuBhC"}
+{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAM,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAO,MAAM,wBAAwB,CAAC;AAGtF,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,CAuBhC"}

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModule = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const error_1 = require("./error");
-async function addModule(ctx, localSettings, inputs) {
+async function addModule(ctx, inputs, localSettings) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
     const module = {
         capabilities: inputs.capabilities || [],

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

@@ -1 +1 @@
-{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAsF;AACtF,mCAAqD;AAE9C,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,aAAmB,EACnB,MAA8D;IAE9D,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAgD,CAAC;IAC7F,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,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,+CAA+C,EAC/C,KAAK,CACN,CAAC;YACF,OAAO,iBAAG,CAAC,IAAI,kCAA0B,EAAE,CAAC,CAAC;SAC9C;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,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,8BA2BC"}
+{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAsF;AACtF,mCAAqD;AAE9C,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,MAAkC,EAClC,aAAoB;IAEpB,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAgD,CAAC;IAC7F,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,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,+CAA+C,EAC/C,KAAK,CACN,CAAC;YACF,OAAO,iBAAG,CAAC,IAAI,kCAA0B,EAAE,CAAC,CAAC;SAC9C;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,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA3BD,8BA2BC"}

package/build/plugins/solution/spfx-solution/scaffold.d.ts

@@ -1,13 +1,5 @@
-import { FxError, Inputs, Json, Result, v2, AppStudioTokenProvider, Void, OptionItem, QTreeNode } from "@microsoft/teamsfx-api";
+import { AppStudioTokenProvider, FxError, Inputs, QTreeNode, Result, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForScaffold(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function scaffold(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    module?: string;
-    template?: OptionItem;
-}): Promise<Result<Void, FxError>>;
-export declare function generateResourceTemplate(ctx: v2.Context, inputs: Inputs): Promise<Result<Json, FxError>>;
 export declare function publishApplication(ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider): Promise<Result<Void, 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=scaffold.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,EAAE,EAEF,sBAAsB,EACtB,IAAI,EAGJ,UAAU,EACV,SAAS,EACV,MAAM,wBAAwB,CAAC;AAOhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmDjD;AAED,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,UAAU,CAAA;CAAE,GAC5E,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,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;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GACxE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAGN,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmDjD;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;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,yBAAyB,GACnC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAEhC"}

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

@@ -2,12 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResource = exports.publishApplication = exports.generateResourceTemplate = exports.scaffold = exports.getQuestionsForScaffold = void 0;
-const tslib_1 = require("tslib");
+exports.addResource = exports.publishApplication = exports.getQuestionsForScaffold = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const typedi_1 = tslib_1.__importDefault(require("typedi"));
+const typedi_1 = require("typedi");
 const constants_1 = require("../fx-solution/v3/constants");
-const error_1 = require("../utils/error");
 const questions_1 = require("../utils/questions");
 async function getQuestionsForScaffold(ctx, inputs) {
     const node = new teamsfx_api_1.QTreeNode({ type: "group" });
@@ -18,7 +16,7 @@ async function getQuestionsForScaffold(ctx, inputs) {
     }
     const templateNode = new teamsfx_api_1.QTreeNode(questions_1.selectScaffoldTemplateQuestion);
     const staticOptions = [];
-    const spfxPlugin = typedi_1.default.get(constants_1.BuiltInScaffoldPluginNames.spfx);
+    const spfxPlugin = typedi_1.Container.get(constants_1.BuiltInScaffoldPluginNames.spfx);
     const scaffoldPlugins = [spfxPlugin];
     for (const plugin of scaffoldPlugins) {
         const getTemplatesRes = await plugin.getTemplates(ctx, inputs);
@@ -60,40 +58,6 @@ async function getQuestionsForScaffold(ctx, inputs) {
     return teamsfx_api_1.ok(node);
 }
 exports.getQuestionsForScaffold = getQuestionsForScaffold;
-async function scaffold(ctx, inputs) {
-    if (!inputs.template) {
-        return teamsfx_api_1.err(new error_1.InvalidInputError(inputs));
-    }
-    const template = inputs.template;
-    if (!template.data) {
-        return teamsfx_api_1.err(new error_1.InvalidInputError(inputs, "template.data is undefined"));
-    }
-    const data = template.data;
-    const pluginName = data.pluginName;
-    const templateName = data.templateName;
-    const plugin = typedi_1.default.get(pluginName);
-    const pluginInputs = Object.assign(Object.assign({}, inputs), { template: templateName });
-    const res = await plugin.scaffold(ctx, pluginInputs);
-    if (res.isErr()) {
-        return teamsfx_api_1.err(res.error);
-    }
-    const manifest = [];
-    if (res.value) {
-        manifest.push(res.value);
-    }
-    inputs.manifest = manifest;
-    pluginInputs.manifest = manifest;
-    //TODO
-    // //call appstudio.scaffold() API
-    // const appstudioPlugin = Container.get<v3.ScaffoldPlugin>(BuiltInResourcePluginNames.AppStudio);
-    // await appstudioPlugin.scaffold(ctx, pluginInputs);
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
-}
-exports.scaffold = scaffold;
-async function generateResourceTemplate(ctx, inputs) {
-    return teamsfx_api_1.ok({});
-}
-exports.generateResourceTemplate = generateResourceTemplate;
 async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/scaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAYgC;AAChC,mCAAmC;AACnC,2DAAyE;AACzE,kDAAoG;AAE7F,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAgC;IAEhC,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAAgD,CAAC;IAC7F,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC5B,MAAM,UAAU,GAAG,0CAA8B,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;KAC3B;IACD,MAAM,YAAY,GAAG,IAAI,uBAAS,CAAC,0CAA8B,CAAC,CAAC;IACnE,MAAM,aAAa,GAAiB,EAAE,CAAC;IACvC,MAAM,UAAU,GAAsB,kBAAS,CAAC,GAAG,CACjD,sCAA0B,CAAC,IAAI,CAChC,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,UAAU,CAAC,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QACpC,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC/D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;SACnC;QACD,KAAK,MAAM,QAAQ,IAAI,eAAe,CAAC,KAAK,EAAE;YAC5C,aAAa,CAAC,IAAI,CAAC;gBACjB,EAAE,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACrC,KAAK,EAAE,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,QAAQ,GAAG;gBAC/C,MAAM,EAAE,QAAQ,CAAC,WAAW;gBAC5B,IAAI,EAAE;oBACJ,UAAU,EAAE,MAAM,CAAC,IAAI;oBACvB,YAAY,EAAE,QAAQ,CAAC,IAAI;iBAC5B;aACF,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,uBAAuB,EAAE;YAClC,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7E,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,IAAI,UAAU,EAAE;oBACd,UAAU,CAAC,SAAS,GAAG;wBACrB,SAAS,EAAE,KAAK,EAAE,KAAiB,EAAE,MAAe,EAA+B,EAAE;4BACnF,IAAI,KAAK,CAAC,IAAI,EAAE;gCACd,IAAK,KAAK,CAAC,IAAY,CAAC,UAAU,KAAK,MAAM,CAAC,IAAI;oCAAE,OAAO,SAAS,CAAC;6BACtE;4BACD,OAAO,EAAE,CAAC;wBACZ,CAAC;qBACF,CAAC;oBACF,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;iBACnC;aACF;SACF;KACF;IACD,0CAA8B,CAAC,aAAa,GAAG,aAAa,CAAC;IAC7D,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAE5B,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAtDD,0DAsDC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;IAErC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAPD,gDAOC;AAEM,KAAK,UAAU,WAAW,CAC/B,GAAe,EACf,MAAoC;IAEpC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AALD,kCAKC"}

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

@@ -1,22 +1,17 @@
-import { FxError, Inputs, Json, Result, v2, v3, AppStudioTokenProvider, Void, QTreeNode, OptionItem } from "@microsoft/teamsfx-api";
+import { v3 } from "@microsoft/teamsfx-api";
+import { scaffold } from "../fx-solution/v3/scaffold";
+import { addModule } from "./addModule";
+import { getQuestionsForInit, init } from "./init";
+import { addResource, getQuestionsForScaffold, publishApplication } from "./scaffold";
 export declare class TeamsSPFxSolution implements v3.ISolution {
     name: string;
     displayName: string;
-    init: (ctx: v2.Context, inputs: v2.InputsWithProjectPath) => Promise<Result<Void, FxError>>;
-    getQuestionsForInit?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<QTreeNode | undefined, FxError>>;
-    scaffold: (ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-        module?: string;
-        template?: OptionItem;
-    }) => Promise<Result<Void, FxError>>;
-    getQuestionsForScaffold?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath) => Promise<Result<QTreeNode | undefined, FxError>>;
-    generateResourceTemplate: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Json, FxError>>;
-    publishApplication: (ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider) => Promise<Result<Void, FxError>>;
-    addResource: (ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-        module?: string;
-        resource?: string;
-    }) => Promise<Result<Void, FxError>>;
-    addModule: (ctx: v2.Context, localSettings: Json, inputs: v2.InputsWithProjectPath & {
-        capabilities?: string[];
-    }) => Promise<Result<Void, FxError>>;
+    init: typeof init;
+    getQuestionsForInit: typeof getQuestionsForInit;
+    scaffold: typeof scaffold;
+    getQuestionsForScaffold: typeof getQuestionsForScaffold;
+    publishApplication: typeof publishApplication;
+    addResource: typeof addResource;
+    addModule: typeof addModule;
 }
 //# sourceMappingURL=solution.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,IAAI,EACJ,MAAM,EACN,EAAE,EACF,EAAE,EACF,sBAAsB,EACtB,IAAI,EACJ,SAAS,EACT,UAAU,EACX,MAAM,wBAAwB,CAAC;AAehC,qBACa,iBAAkB,YAAW,EAAE,CAAC,SAAS;IACpD,IAAI,SAA6B;IACjC,WAAW,EAAE,MAAM,CAAkC;IAErD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,qBAAqB,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CACpF;IACP,mBAAmB,CAAC,EAAE,CACpB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAuB;IAE3E,QAAQ,EAAE,CACR,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,UAAU,CAAA;KAAE,KAC1E,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAY;IAC/C,uBAAuB,CAAC,EAAE,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,KAC7B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA2B;IAE/E,wBAAwB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IAE3B,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,KAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAsB;IAEzD,WAAW,EAAE,CACX,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAe;IAElD,SAAS,EAAE,CACT,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,aAAa,EAAE,IAAI,EACnB,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,KAC3D,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAa;CACjD"}
+{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAI5C,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEtF,qBACa,iBAAkB,YAAW,EAAE,CAAC,SAAS;IACpD,IAAI,SAA6B;IACjC,WAAW,EAAE,MAAM,CAAkC;IAErD,IAAI,cAAQ;IACZ,mBAAmB,6BAAuB;IAE1C,QAAQ,kBAAY;IACpB,uBAAuB,iCAA2B;IAElD,kBAAkB,4BAAsB;IAExC,WAAW,qBAAe;IAE1B,SAAS,mBAAa;CACvB"}

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

@@ -4,12 +4,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamsSPFxSolution = void 0;
 const tslib_1 = require("tslib");
-const constants_1 = require("../../../common/constants");
-const scaffold_1 = require("./scaffold");
-const init_1 = require("./init");
 const typedi_1 = require("typedi");
+const constants_1 = require("../../../common/constants");
 const constants_2 = require("../fx-solution/v3/constants");
+const scaffold_1 = require("../fx-solution/v3/scaffold");
 const addModule_1 = require("./addModule");
+const init_1 = require("./init");
+const scaffold_2 = require("./scaffold");
 let TeamsSPFxSolution = class TeamsSPFxSolution {
     constructor() {
         this.name = constants_2.BuiltInSolutionNames.spfx;
@@ -17,10 +18,9 @@ let TeamsSPFxSolution = class TeamsSPFxSolution {
         this.init = init_1.init;
         this.getQuestionsForInit = init_1.getQuestionsForInit;
         this.scaffold = scaffold_1.scaffold;
-        this.getQuestionsForScaffold = scaffold_1.getQuestionsForScaffold;
-        this.generateResourceTemplate = scaffold_1.generateResourceTemplate;
-        this.publishApplication = scaffold_1.publishApplication;
-        this.addResource = scaffold_1.addResource;
+        this.getQuestionsForScaffold = scaffold_2.getQuestionsForScaffold;
+        this.publishApplication = scaffold_2.publishApplication;
+        this.addResource = scaffold_2.addResource;
         this.addModule = addModule_1.addModule;
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAelC,yDAA8D;AAE9D,yCAMoB;AACpB,iCAAmD;AACnD,mCAAiC;AACjC,2DAAmE;AACnE,2CAAwC;AAGxC,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAG,gCAAoB,CAAC,IAAI,CAAC;QACjC,gBAAW,GAAW,6BAAiB,CAAC,YAAY,CAAC;QAErD,SAAI,GACF,WAAI,CAAC;QACP,wBAAmB,GAGoC,0BAAmB,CAAC;QAE3E,aAAQ,GAG8B,mBAAQ,CAAC;QAC/C,4BAAuB,GAGgC,kCAAuB,CAAC;QAE/E,6BAAwB,GACtB,mCAAwB,CAAC;QAE3B,uBAAkB,GAKoB,6BAAkB,CAAC;QAEzD,gBAAW,GAG2B,sBAAW,CAAC;QAElD,cAAS,GAI6B,qBAAS,CAAC;IAClD,CAAC;CAAA,CAAA;AAxCY,iBAAiB;IAD7B,gBAAO,CAAC,gCAAoB,CAAC,IAAI,CAAC;GACtB,iBAAiB,CAwC7B;AAxCY,8CAAiB"}
+{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../src/plugins/solution/spfx-solution/solution.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,mCAAiC;AACjC,yDAA8D;AAC9D,2DAAmE;AACnE,yDAAsD;AACtD,2CAAwC;AACxC,iCAAmD;AACnD,yCAAsF;AAGtF,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAA9B;QACE,SAAI,GAAG,gCAAoB,CAAC,IAAI,CAAC;QACjC,gBAAW,GAAW,6BAAiB,CAAC,YAAY,CAAC;QAErD,SAAI,GAAG,WAAI,CAAC;QACZ,wBAAmB,GAAG,0BAAmB,CAAC;QAE1C,aAAQ,GAAG,mBAAQ,CAAC;QACpB,4BAAuB,GAAG,kCAAuB,CAAC;QAElD,uBAAkB,GAAG,6BAAkB,CAAC;QAExC,gBAAW,GAAG,sBAAW,CAAC;QAE1B,cAAS,GAAG,qBAAS,CAAC;IACxB,CAAC;CAAA,CAAA;AAfY,iBAAiB;IAD7B,gBAAO,CAAC,gCAAoB,CAAC,IAAI,CAAC;GACtB,iBAAiB,CAe7B;AAfY,8CAAiB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.2.1",
+  "version": "1.2.2-alpha.01a113d2.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "lint:staged": "lint-staged",
     "lint": "eslint \"src/**/*.ts\" \"tests/**/*.ts\"",
     "test:bot": "nyc mocha \"tests/plugins/resource/bot/**/*.test.ts\"",
-    "test:blazor": "nyc mocha \"tests/plugins/resource/blazor/**/*.test.ts\"",
+    "test:dotnet": "nyc mocha \"tests/plugins/resource/dotnet/**/*.test.ts\"",
     "test:function": "nyc mocha \"tests/plugins/resource/function/**/*.test.ts\"",
     "test:localdebug": "nyc mocha \"tests/plugins/resource/localdebug/**/*.test.ts\"",
     "test:frontend": "nyc mocha \"tests/plugins/resource/frontend/**/*.test.ts\"",
@@ -38,10 +38,10 @@
     "prepare": "npm run build && node ./scripts/download-templates-zip.js $(git tag --list)",
     "prepublishOnly": "npm run test:unit && npm run build",
     "package": "rimraf build && webpack --mode production --config ./webpack.config.js",
-    "precommit": "lint-staged",
-    "install:api": "cd api && npm install",
+    "check-sensitive": "npx eslint --plugin 'no-secrets' --cache --ignore-pattern 'package.json' --ignore-pattern 'package-lock.json'",
+    "precommit": "npm run check-sensitive && lint-staged",
     "install:tabs": "cd tabs && npm install",
-    "installAll": "npm run install:api & npm run install:tabs"
+    "installAll": "npm run install:tabs"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.2",
@@ -57,7 +57,8 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.13.0",
+    "@microsoft/teamsfx-api": "0.13.1-alpha.01a113d2.0",
+    "@npmcli/arborist": "^4.2.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -66,6 +67,7 @@
     "axios": "^0.21.2",
     "cryptr": "^6.0.2",
     "dateformat": "^4.5.1",
+    "detect-port": "^1.3.0",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "fs-extra": "^9.1.0",
@@ -83,7 +85,7 @@
     "md5": "^2.3.0",
     "mime": "^2.5.2",
     "mustache": "^4.2.0",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.0.0",
     "node-ts-uuid": "^1.0.8",
     "openapi-types": "^7.2.3",
     "proper-lockfile": "^4.1.2",
@@ -111,6 +113,7 @@
     "@types/chai-spies": "^1.0.3",
     "@types/cryptr": "^4.0.1",
     "@types/dateformat": "^3.0.1",
+    "@types/detect-port": "^1.3.2",
     "@types/express": "^4.17.9",
     "@types/faker": "^5.5.0",
     "@types/fs-extra": "^9.0.9",
@@ -127,6 +130,7 @@
     "@types/mustache": "^4.1.1",
     "@types/node": "^14.14.21",
     "@types/node-forge": "^0.9.7",
+    "@types/proxyquire": "^1.3.28",
     "@types/semver": "^7.3.4",
     "@types/sinon": "^9.0.10",
     "@types/tedious": "^4.0.3",
@@ -143,6 +147,7 @@
     "dotenv": "^8.2.0",
     "eslint": "^7.22.0",
     "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-no-secrets": "^0.8.9",
     "eslint-plugin-prettier": "^4.0.0",
     "faker": "^5.5.2",
     "find-process": "^1.4.4",
@@ -153,6 +158,7 @@
     "mocked-env": "^1.3.5",
     "nyc": "^15.1.0",
     "prettier": "^2.4.1",
+    "proxyquire": "^2.1.3",
     "sinon": "^9.2.2",
     "source-map-support": "^0.5.19",
     "tmp": "^0.2.1",
@@ -160,7 +166,6 @@
     "ts-node": "^9.1.1",
     "tslint": "^6.1.3",
     "ttypescript": "^1.5.12",
-    "typedoc": "^0.20.35",
     "typescript": "^4.2.3",
     "webpack": "^5.61.0",
     "webpack-cli": "^4.9.1"
@@ -170,7 +175,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "d4a44235517c4db456d9f6c680bca8042dfc8a8e",
+  "gitHead": "2e3851154d1fc2984c7612de76409bc4c49edd78",
   "publishConfig": {
     "access": "public"
   },

package/resource/strings.json

@@ -13,12 +13,22 @@
     "FailedToDeployBeforeProvision": "Failed to deploy because the resources have not been provisioned yet. Make sure you do the provision first. Click Get Help to learn more about why you need to provision.",
     "FailedToPublishBeforeProvision": "Failed to publish because the resources have not been provisioned yet. Make sure you do the provision first. Click Get Help to learn more about why you need to provision.",
     "SPFxAskProvisionBeforePublish": "Failed to publish because the teams app has not been provisioned yet. Please provision first. Click Get Help to learn more about why you need to provision.",
-    "AddResourceNotice": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource(s) in your Azure subscription.",
-    "AddResourceNoticeForCli": "[Teams Toolkit] Resource \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resource(s) in your Azure subscription.",
-    "AddCapabilityNotice": "[Teams Toolkit] Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-    "AddCapabilitiesNotice": "[Teams Toolkit] Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-    "AddCapabilityNoticeForCli": "[Teams Toolkit] Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
-    "AddCapabilitiesNoticeForCli": "[Teams Toolkit] Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
+    "addCapability" : {
+      "OnlySupportAzure": "Add capability is only supported for project hosted in Azure",
+      "ExceedMaxLimit": "Your App reaches maximal limit for Tabs, Bot and Message Extension.",
+      "AddCapabilityNotice": "[Teams Toolkit] Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
+      "AddCapabilitiesNotice": "[Teams Toolkit] Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
+      "AddCapabilityNoticeForCli": "[Teams Toolkit] Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
+      "AddCapabilitiesNoticeForCli": "[Teams Toolkit] Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting."
+    },
+    "addResource": {
+      "OnlySupportAzure": "Add resource is only supported for project hosted in Azure",
+      "NotSupportForVSProject": "Add resource is not supported for csharp project",
+      "AddResourceNotice": "[Teams Toolkit] Resource \"%s\" has been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource in your Azure subscription.",
+      "AddResourceNoticeForCli": "[Teams Toolkit] Resource \"%s\" has been successfully configured for your project, run 'teamsfx provision' will create the resource in your Azure subscription.",
+      "AddResourcesNotice": "[Teams Toolkit] Resources \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resources in your Azure subscription.",
+      "AddResourcesNoticeForCli": "[Teams Toolkit] Resources \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resources in your Azure subscription."
+    },
     "CancelProvision": "CancelProvision",
     "AlreadyProvisionNotice": "'%s' is already provisioned in the cloud, will create the teams app again if it has been removed.",
     "NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
@@ -47,14 +57,19 @@
     "ProvisionFinishNotice": "[%s] Provison finished!",
     "DeployStartNotice": "[%s] Deployment start.",
     "SelectedPluginsToDeployNotice": "[%s] Selected plugins to deploy: %s",
-    "PublishStartNotice": "[%s] Publish start."
+    "PublishStartNotice": "[%s] Publish start.",
+    "Collaboration": {
+      "ListCollaboratorsSuccess": "List M365 Teams App%s owners success, you can view it in Teams Toolkit output window",
+      "WithAadApp": "(With AAD App)",
+      "FailedToListCollaborators": "Failed to list Teams App owners for the project.\nError details: \n"
+    }
   },
   "plugins": {
     "SPFx": {
       "buildNotice": "SharePoint package successfully built at %s.",
       "deployNotice": "SharePoint package %s has been successfully deployed to [%s](%s).",
       "deployFailedNotice": "You don't have permission to upload and deploy package to App Catalog %s, please use site admin account, or you can get your own free Microsoft 365 tenant from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program)",
-      "createAppCatalogNotice": "There is no tenant app catalog under %s, you can Read more about how to create app catalog site."
+      "createAppCatalogNotice": "There is no tenant app catalog under %s, do you want to create one?"
     }
   }
 }

package/templates/plugins/resource/apim/bicep/apimConfiguration.bicep

@@ -38,6 +38,7 @@ var scope = '${m365ApplicationIdUri}/.default'
 var authorizationEndpoint = uri(m365OauthAuthorityHost, '${m365TenantId}/oauth2/v2.0/authorize')
 var tokenEndpoint = uri(m365OauthAuthorityHost, '${m365TenantId}/oauth2/v2.0/token')
 
+//Enables Microsoft Power Platform to access your APIs hosted in Function App
 resource apimServiceAuthServer 'Microsoft.ApiManagement/service/authorizationServers@2020-12-01' = {
   name: '${apimServiceName}/${oauthServerName}'
   properties: {

package/templates/plugins/resource/apim/bicep/apimProvision.bicep

@@ -2,12 +2,13 @@
 param provisionParameters object
 
 var resourceBaseName = provisionParameters['resourceBaseName']
-var apimServiceName = contains(provisionParameters, 'apimServiceName') ? provisionParameters['apimServiceName'] : '${resourceBaseName}'
-var apimServiceSku = contains(provisionParameters, 'apimServiceSku') ? provisionParameters['apimServiceSku'] : 'Consumption'
-var productName = contains(provisionParameters, 'apimProductName') ? provisionParameters['apimProductName'] : '${resourceBaseName}'
-var publisherEmail = provisionParameters['apimPublisherEmail']
-var publisherName = provisionParameters['apimPublisherName']
+var apimServiceName = contains(provisionParameters, 'apimServiceName') ? provisionParameters['apimServiceName'] : '${resourceBaseName}' // Try to read name for APIM Service from parameters
+var apimServiceSku = contains(provisionParameters, 'apimServiceSku') ? provisionParameters['apimServiceSku'] : 'Consumption'  // Try to read SKU for APIM Service from parameters
+var productName = contains(provisionParameters, 'apimProductName') ? provisionParameters['apimProductName'] : '${resourceBaseName}'  // Try to read name for APIM Product from parameters
+var publisherEmail = provisionParameters['apimPublisherEmail']  // Read publisher email for APIM Service from parameters, this parameter is required
+var publisherName = provisionParameters['apimPublisherName'] // Read publisher name for APIM Service from parameters, this parameter is required
 
+// APIM Service that helps manage your APIs
 resource apimService 'Microsoft.ApiManagement/service@2020-12-01' = {
   name: apimServiceName
   location: resourceGroup().location
@@ -21,6 +22,7 @@ resource apimService 'Microsoft.ApiManagement/service@2020-12-01' = {
   }
 }
 
+// Group your APIs, define terms of use and runtime policies
 resource apimServiceProduct 'Microsoft.ApiManagement/service/products@2020-12-01' = {
   parent: apimService
   name: productName

package/templates/plugins/resource/apim/bicep/config.template.bicep

@@ -1,3 +1,4 @@
+// Add TeamsFx configurations to APIM resources
 module teamsFxApimConfig '\{{fx-resource-apim.Configuration.apim.path}}' = {
   name: 'addTeamsFxApimConfiguration'
   params: {