@microsoft/teamsfx-core 1.11.0-rc.0 → 1.11.1-alpha.aafe8a553.0

package/build/common/local/index.d.ts

@@ -3,4 +3,5 @@ export * from "./packageJsonHelper";
 export * from "./projectSettingsHelper";
 export * from "./taskDefinition";
 export * from "./constants";
+export * from "./localTelemetryReporter";
 //# sourceMappingURL=index.d.ts.map

package/build/common/local/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC"}

package/build/common/local/index.js

@@ -8,4 +8,5 @@ tslib_1.__exportStar(require("./packageJsonHelper"), exports);
 tslib_1.__exportStar(require("./projectSettingsHelper"), exports);
 tslib_1.__exportStar(require("./taskDefinition"), exports);
 tslib_1.__exportStar(require("./constants"), exports);
+tslib_1.__exportStar(require("./localTelemetryReporter"), exports);
 //# sourceMappingURL=index.js.map

package/build/common/local/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,4DAAkC;AAClC,8DAAoC;AACpC,kEAAwC;AACxC,2DAAiC;AACjC,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,4DAAkC;AAClC,8DAAoC;AACpC,kEAAwC;AACxC,2DAAiC;AACjC,sDAA4B;AAC5B,mEAAyC"}

package/build/common/local/localTelemetryReporter.d.ts

@@ -0,0 +1,68 @@
+import { FxError, Result } from "@microsoft/teamsfx-api";
+export interface TelemetryContext {
+    properties: Record<string, string>;
+    measurements: Record<string | "duration", number>;
+}
+export interface ToolTelemetryReporter {
+    sendTelemetryErrorEvent(eventName: string, error: FxError, properties?: {
+        [key: string]: string;
+    }, measurements?: {
+        [key: string]: number;
+    }, errorProps?: string[]): void;
+    sendTelemetryEvent(eventName: string, properties?: {
+        [p: string]: string;
+    }, measurements?: {
+        [p: string]: number;
+    }): void;
+}
+export declare class LocalTelemetryReporter {
+    static readonly NoLastEventName = "no-last-event";
+    static readonly PropertyDebugLastEventName = "debug-last-event-name";
+    static readonly PropertyDuration = "duration";
+    private static readonly ComponentName;
+    private static readonly StartEventSuffix;
+    private readonly reporter;
+    private lastEventName;
+    constructor(reporter: ToolTelemetryReporter);
+    /**
+     * Same as `runWithTelemetryProperties` but without `initialProperties`.
+     */
+    runWithTelemetry<T>(eventName: string, action: (ctx: TelemetryContext) => Promise<Result<T, FxError>>): Promise<Result<T, FxError>>;
+    /**
+     * Same as `runWithTelemetry` but use exception. Not recommended.
+     */
+    runWithTelemetryException<T>(eventName: string, action: (ctx: TelemetryContext) => Promise<T>): Promise<T>;
+    runWithTelemetryExceptionProperties<T>(eventName: string, initialProperties: {
+        [key: string]: string;
+    }, action: (ctx: TelemetryContext) => Promise<T>): Promise<T>;
+    /**
+     * Ensure "{eventName}-start" and "{eventName}" telemetry events with the following properties/measurements to be sent on start/end/exception.
+     *
+     * @param action: The actual action. User can set additional properties in execution into ctx.properties and ctx.measurements.
+     * The `ctx` parameter has higher priority over `initialProperties` and auto-generated properties.
+     * @param initialProperties: If specified, "{eventName}-start" and "{eventName}" will contain these properties.
+     * User may return anything and errors are handled by exception.
+     */
+    runWithTelemetryProperties<T>(eventName: string, initialProperties: {
+        [key: string]: string;
+    }, action: (ctx: TelemetryContext) => Promise<Result<T, FxError>>): Promise<Result<T, FxError>>;
+    /**
+     * Same as `runWithTelemtry()` but supports any return type.
+     * User need to specify `getResultForTelemetry` to convert the result to `Result<T, FxError>`, so it can send correct telemetry.
+     */
+    runWithTelemetryGeneric<T>(eventName: string, action: (ctx: TelemetryContext) => Promise<T>, getResultForTelemetry: (result: T, ctx: TelemetryContext) => FxError | undefined, initialProperties?: {
+        [key: string]: string;
+    }): Promise<T>;
+    getLastEventName(): string;
+    sendTelemetryEvent(eventName: string, properties?: {
+        [key: string]: string;
+    }, measurements?: {
+        [key: string]: number;
+    }): void;
+    sendTelemetryErrorEvent(eventName: string, error: FxError, properties?: {
+        [p: string]: string;
+    }, measurements?: {
+        [p: string]: number;
+    }, errorProps?: string[]): void;
+}
+//# sourceMappingURL=localTelemetryReporter.d.ts.map

package/build/common/local/localTelemetryReporter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"localTelemetryReporter.d.ts","sourceRoot":"","sources":["../../../src/common/local/localTelemetryReporter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAIjF,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEnC,YAAY,EAAE,MAAM,CAAC,MAAM,GAAG,UAAU,EAAE,MAAM,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,qBAAqB;IACpC,uBAAuB,CACrB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACtC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACxC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,IAAI,CAAC;IAER,kBAAkB,CAChB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACpC,YAAY,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACrC,IAAI,CAAC;CACT;AAGD,qBAAa,sBAAsB;IACjC,gBAAuB,eAAe,mBAAmB;IACzD,gBAAuB,0BAA0B,2BAA2B;IAC5E,gBAAuB,gBAAgB,cAAc;IAErD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAiB;IACtD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,aAAa,CAAqB;gBAE9B,QAAQ,EAAE,qBAAqB;IAI3C;;OAEG;IACU,gBAAgB,CAAC,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,GAC7D,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAI9B;;OAEG;IACU,yBAAyB,CAAC,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,GAC5C,OAAO,CAAC,CAAC,CAAC;IAIA,mCAAmC,CAAC,CAAC,EAChD,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC5C,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,GAC5C,OAAO,CAAC,CAAC,CAAC;IASb;;;;;;;OAOG;IACU,0BAA0B,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC5C,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,GAC7D,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAW9B;;;OAGG;IACU,uBAAuB,CAAC,CAAC,EACpC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,EAC7C,qBAAqB,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,gBAAgB,KAAK,OAAO,GAAG,SAAS,EAChF,iBAAiB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,CAAC,CAAC;IA6CN,gBAAgB,IAAI,MAAM;IAM1B,kBAAkB,CACvB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACtC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GACvC,IAAI;IAKA,uBAAuB,CAC5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,OAAO,EACd,UAAU,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACpC,YAAY,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACtC,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,IAAI;CAUR"}

package/build/common/local/localTelemetryReporter.js

@@ -0,0 +1,113 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalTelemetryReporter = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const perf_hooks_1 = require("perf_hooks");
+const telemetry_1 = require("../telemetry");
+// Telemetry utility for local debug/preview in vsc/cli
+class LocalTelemetryReporter {
+    constructor(reporter) {
+        this.reporter = reporter;
+    }
+    /**
+     * Same as `runWithTelemetryProperties` but without `initialProperties`.
+     */
+    async runWithTelemetry(eventName, action) {
+        return await this.runWithTelemetryProperties(eventName, {}, action);
+    }
+    /**
+     * Same as `runWithTelemetry` but use exception. Not recommended.
+     */
+    async runWithTelemetryException(eventName, action) {
+        return await this.runWithTelemetryGeneric(eventName, action, () => undefined);
+    }
+    async runWithTelemetryExceptionProperties(eventName, initialProperties, action) {
+        return await this.runWithTelemetryGeneric(eventName, action, () => undefined, initialProperties);
+    }
+    /**
+     * Ensure "{eventName}-start" and "{eventName}" telemetry events with the following properties/measurements to be sent on start/end/exception.
+     *
+     * @param action: The actual action. User can set additional properties in execution into ctx.properties and ctx.measurements.
+     * The `ctx` parameter has higher priority over `initialProperties` and auto-generated properties.
+     * @param initialProperties: If specified, "{eventName}-start" and "{eventName}" will contain these properties.
+     * User may return anything and errors are handled by exception.
+     */
+    async runWithTelemetryProperties(eventName, initialProperties, action) {
+        return await this.runWithTelemetryGeneric(eventName, action, (value) => {
+            return value.isErr() ? value.error : undefined;
+        }, initialProperties);
+    }
+    /**
+     * Same as `runWithTelemtry()` but supports any return type.
+     * User need to specify `getResultForTelemetry` to convert the result to `Result<T, FxError>`, so it can send correct telemetry.
+     */
+    async runWithTelemetryGeneric(eventName, action, getResultForTelemetry, initialProperties) {
+        const startMillis = perf_hooks_1.performance.now();
+        this.sendTelemetryEvent(eventName + LocalTelemetryReporter.StartEventSuffix, initialProperties);
+        const ctx = { properties: initialProperties || {}, measurements: {} };
+        // 3 cases in one result: Result<[actual result, FxError], exception>
+        let result;
+        try {
+            const value = await action(ctx);
+            const resultForTelemetry = getResultForTelemetry(value, ctx);
+            result = teamsfx_api_1.ok([value, resultForTelemetry]);
+        }
+        catch (error) {
+            result = teamsfx_api_1.err(error);
+        }
+        const endMillis = perf_hooks_1.performance.now();
+        const durationSeconds = (endMillis - startMillis) / 1000;
+        const properties = Object.assign({}, ctx.properties);
+        const measurements = Object.assign({
+            [LocalTelemetryReporter.PropertyDuration]: durationSeconds,
+        }, ctx.measurements);
+        if (result.isErr()) {
+            // exception
+            const error = teamsfx_api_1.assembleError(result.error, LocalTelemetryReporter.ComponentName);
+            properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.No;
+            this.sendTelemetryErrorEvent(eventName, error, properties, measurements);
+            // Propagate exception because wrapper function should not change original behavior.
+            throw result.error;
+        }
+        else if (result.value[1] !== undefined) {
+            // FxError
+            properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.No;
+            this.sendTelemetryErrorEvent(eventName, result.value[1], properties, measurements);
+            return result.value[0];
+        }
+        else {
+            // success
+            properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.Yes;
+            this.sendTelemetryEvent(eventName, properties, measurements);
+            return result.value[0];
+        }
+    }
+    getLastEventName() {
+        return this.lastEventName === undefined
+            ? LocalTelemetryReporter.NoLastEventName
+            : this.lastEventName;
+    }
+    sendTelemetryEvent(eventName, properties, measurements) {
+        this.lastEventName = eventName;
+        this.reporter.sendTelemetryEvent(eventName, properties, measurements);
+    }
+    sendTelemetryErrorEvent(eventName, error, properties, measurements, errorProps) {
+        if ((properties === null || properties === void 0 ? void 0 : properties[LocalTelemetryReporter.PropertyDebugLastEventName]) === undefined) {
+            if (properties === undefined) {
+                properties = {};
+            }
+            properties[LocalTelemetryReporter.PropertyDebugLastEventName] = this.getLastEventName();
+        }
+        this.lastEventName = eventName;
+        this.reporter.sendTelemetryErrorEvent(eventName, error, properties, measurements, errorProps);
+    }
+}
+exports.LocalTelemetryReporter = LocalTelemetryReporter;
+LocalTelemetryReporter.NoLastEventName = "no-last-event";
+LocalTelemetryReporter.PropertyDebugLastEventName = "debug-last-event-name";
+LocalTelemetryReporter.PropertyDuration = "duration";
+LocalTelemetryReporter.ComponentName = "local-debug";
+LocalTelemetryReporter.StartEventSuffix = "-start";
+//# sourceMappingURL=localTelemetryReporter.js.map

package/build/common/local/localTelemetryReporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"localTelemetryReporter.js","sourceRoot":"","sources":["../../../src/common/local/localTelemetryReporter.ts"],"names":[],"mappings":"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"}

package/build/common/local/projectSettingsHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAahF,qBAAa,qBAAqB;IAEhC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEtD;WAEV,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAMtE,cAAc,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WASrE,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAM3E,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAK/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CACL;IAE7E,OAAc,iBAAiB,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEhD;WAE3B,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,MAAM,EAAE;CAIzF"}
+{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAqB,MAAM,wBAAwB,CAAC;AAwBnG,qBAAa,qBAAqB;IAEhC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAIlD;WAEd,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAOtE,cAAc,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAUrE,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAO3E,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAM/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGD;IAEjF,OAAc,iBAAiB,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAI5C;WAE/B,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,MAAM,EAAE;CAIzF"}

package/build/common/local/projectSettingsHelper.js

@@ -7,13 +7,19 @@ const question_1 = require("../../plugins/solution/fx-solution/question");
 const tools_1 = require("../tools");
 const constants_1 = require("../constants");
 const constants_2 = require("./constants");
+const core_1 = require("../../core");
+const projectSettingsHelperV3_1 = require("../projectSettingsHelperV3");
 class ProjectSettingsHelper {
     static includeFrontend(projectSettings) {
+        if (core_1.isV3())
+            return projectSettingsHelperV3_1.hasAzureTab(projectSettings);
         const solutionSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings;
         const cap = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || [];
         return (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.hostType) === question_1.HostTypeOptionAzure.id && cap.includes(question_1.TabOptionItem.id);
     }
     static includeBackend(projectSettings) {
+        if (core_1.isV3())
+            return projectSettingsHelperV3_1.hasFunction(projectSettings);
         const solutionSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings;
         const azureResources = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || [];
         return ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.hostType) === question_1.HostTypeOptionAzure.id &&
@@ -21,12 +27,16 @@ class ProjectSettingsHelper {
     }
     static includeFuncHostedBot(projectSettings) {
         var _a, _b, _c;
+        if (core_1.isV3())
+            return projectSettingsHelperV3_1.hasFunctionBot(projectSettings);
         const botHostType = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.pluginSettings) === null || _a === void 0 ? void 0 : _a[constants_1.ResourcePlugins.Bot]) === null || _b === void 0 ? void 0 : _b[constants_2.BotHostTypeName];
         const cap = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _c === void 0 ? void 0 : _c.capabilities) || [];
         return cap.includes(question_1.BotOptionItem.id) && botHostType === constants_2.BotHostTypes.AzureFunctions;
     }
     static includeBot(projectSettings) {
         var _a;
+        if (core_1.isV3())
+            return projectSettingsHelperV3_1.hasBot(projectSettings);
         const cap = ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.capabilities) || [];
         return cap.includes(question_1.BotOptionItem.id) || cap.includes(question_1.MessageExtensionItem.id);
     }
@@ -40,11 +50,17 @@ exports.ProjectSettingsHelper = ProjectSettingsHelper;
 // keep the same logic as plugin.activate()
 ProjectSettingsHelper.isSpfx = (projectSettings) => {
     var _a;
-    return ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType) ===
-        question_1.HostTypeOptionSPFx.id;
+    return core_1.isV3()
+        ? projectSettingsHelperV3_1.hasSPFxTab(projectSettings)
+        : ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType) ===
+            question_1.HostTypeOptionSPFx.id;
 };
-ProjectSettingsHelper.includeAAD = (projectSettings) => !!tools_1.isAADEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings);
+ProjectSettingsHelper.includeAAD = (projectSettings) => core_1.isV3()
+    ? projectSettingsHelperV3_1.hasAAD(projectSettings)
+    : !!tools_1.isAADEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings);
 ProjectSettingsHelper.includeSimpleAuth = (projectSettings) => 
 // TODO: update this when retiring simple auth service
-!!tools_1.IsSimpleAuthEnabled(projectSettings);
+core_1.isV3()
+    ? projectSettingsHelperV3_1.hasSimpleAuth(projectSettings)
+    : !!tools_1.IsSimpleAuthEnabled(projectSettings);
 //# sourceMappingURL=projectSettingsHelper.js.map

package/build/common/local/projectSettingsHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,oCAA6D;AAC7D,4CAA+C;AAC/C,2CAA6E;AAE7E,MAAa,qBAAqB;IAMzB,MAAM,CAAC,eAAe,CAAC,eAA4C;QACxE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,GAAG,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QACjD,OAAO,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,eAA4C;QACvE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,cAAc,GAAG,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAA2B,KAAI,EAAE,CAAC;QAC5E,OAAO,CACL,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE;YACrD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,eAA4C;;QAC7E,MAAM,WAAW,GAAG,MAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,cAAc,0CAAG,2BAAe,CAAC,GAAG,CAAC,0CAAG,2BAAe,CAAC,CAAC;QAC9F,MAAM,GAAG,GAAG,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,YAAY,KAAI,EAAE,CAAC;QAC7F,OAAO,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,WAAW,KAAK,wBAAY,CAAC,cAAc,CAAC;IACvF,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,eAA4C;;QACnE,MAAM,GAAG,GAAG,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,YAAY,KAAI,EAAE,CAAC;QAC7F,OAAO,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IASM,MAAM,CAAC,kBAAkB,CAAC,eAA4C;;QAC3E,OAAO,CAAC,CAAA,MAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,cAAc,0CAAG,2BAAe,CAAC,GAAG,CAAC,0CAAG,2BAAe,CAAC;YAC/E,EAAE,CAAa,CAAC;IACpB,CAAC;;AA1CH,sDA2CC;AA1CC,2CAA2C;AAC7B,4BAAM,GAAG,CAAC,eAA4C,EAAW,EAAE;;IAC/E,OAAA,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,QAAQ;QACtE,6BAAkB,CAAC,EAAE,CAAA;CAAA,CAAC;AA4BV,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE,CACnF,CAAC,CAAC,oBAAY,CAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC,CAAC;AAE/D,uCAAiB,GAAG,CAAC,eAA4C,EAAW,EAAE;AAC1F,sDAAsD;AACtD,CAAC,CAAC,2BAAmB,CAAC,eAAe,CAAC,CAAC"}
+{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"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"}

package/build/common/projectSettingsHelper.d.ts

@@ -4,6 +4,7 @@ export declare function isValidProject(workspacePath?: string): boolean;
 export declare function hasAAD(projectSetting: ProjectSettings): boolean;
 export declare function hasSPFx(projectSetting: ProjectSettings): boolean;
 export declare function hasAzureResource(projectSetting: ProjectSettings, excludeAad?: boolean): boolean;
+export declare function getAzurePlugins(excludeAad?: boolean): string[];
 export declare function isExistingTabApp(projectSettings: ProjectSettings): boolean;
 export declare function getProjectSettingsVersion(): string;
 export declare function newProjectSettings(): ProjectSettings;

package/build/common/projectSettingsHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAchC,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CA6B5F;AAoBD,wBAAgB,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAW9D;AAED,wBAAgB,MAAM,CAAC,cAAc,EAAE,eAAe,GAAG,OAAO,CAI/D;AAED,wBAAgB,OAAO,CAAC,cAAc,EAAE,eAAe,GAAG,OAAO,CAIhE;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,eAAe,EAAE,UAAU,UAAQ,GAAG,OAAO,CAoB7F;AAED,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAe1E;AAED,wBAAgB,yBAAyB,WAExC;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAOpD;AACD,wBAAgB,WAAW,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAEtE"}
+{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAchC,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CA6B5F;AAoBD,wBAAgB,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAW9D;AAED,wBAAgB,MAAM,CAAC,cAAc,EAAE,eAAe,GAAG,OAAO,CAI/D;AAED,wBAAgB,OAAO,CAAC,cAAc,EAAE,eAAe,GAAG,OAAO,CAIhE;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,eAAe,EAAE,UAAU,UAAQ,GAAG,OAAO,CAQ7F;AAED,wBAAgB,eAAe,CAAC,UAAU,UAAQ,GAAG,MAAM,EAAE,CAe5D;AAED,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAe1E;AAED,wBAAgB,yBAAyB,WAExC;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAOpD;AACD,wBAAgB,WAAW,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAEtE"}

package/build/common/projectSettingsHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVSProject = exports.newProjectSettings = exports.getProjectSettingsVersion = exports.isExistingTabApp = exports.hasAzureResource = exports.hasSPFx = exports.hasAAD = exports.isValidProject = exports.validateProjectSettings = void 0;
+exports.isVSProject = exports.newProjectSettings = exports.getProjectSettingsVersion = exports.isExistingTabApp = exports.getAzurePlugins = exports.hasAzureResource = exports.hasSPFx = exports.hasAAD = exports.isValidProject = exports.validateProjectSettings = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -93,6 +93,15 @@ function hasAzureResource(projectSetting, excludeAad = false) {
     const solutionSettings = projectSetting.solutionSettings;
     if (!solutionSettings)
         return false;
+    const azurePlugins = getAzurePlugins(excludeAad);
+    for (const pluginName of solutionSettings.activeResourcePlugins) {
+        if (azurePlugins.includes(pluginName))
+            return true;
+    }
+    return false;
+}
+exports.hasAzureResource = hasAzureResource;
+function getAzurePlugins(excludeAad = false) {
     const azurePlugins = [
         constants_1.BuiltInFeaturePluginNames.apim,
         constants_1.BuiltInFeaturePluginNames.bot,
@@ -106,13 +115,9 @@ function hasAzureResource(projectSetting, excludeAad = false) {
     if (!excludeAad) {
         azurePlugins.push(constants_1.BuiltInFeaturePluginNames.aad);
     }
-    for (const pluginName of solutionSettings.activeResourcePlugins) {
-        if (azurePlugins.includes(pluginName))
-            return true;
-    }
-    return false;
+    return azurePlugins;
 }
-exports.hasAzureResource = hasAzureResource;
+exports.getAzurePlugins = getAzurePlugins;
 function isExistingTabApp(projectSettings) {
     var _a;
     const solutionSettings = projectSettings.solutionSettings;

package/build/common/projectSettingsHelper.js.map

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

package/build/common/projectSettingsHelperV3.d.ts

@@ -1,10 +1,12 @@
 import { ProjectSettingsV3 } from "@microsoft/teamsfx-api";
 export declare function validateProjectSettings(projectSettings: ProjectSettingsV3): string | undefined;
 export declare function hasTab(projectSettings: ProjectSettingsV3): boolean;
+export declare function hasAzureTab(projectSettings: ProjectSettingsV3): boolean;
 export declare function hasBot(projectSettings: ProjectSettingsV3): boolean;
 export declare function hasFunctionBot(projectSettings: ProjectSettingsV3): boolean;
 export declare function hasAAD(projectSettings: ProjectSettingsV3): boolean;
 export declare function hasFunction(projectSettings: ProjectSettingsV3): boolean;
 export declare function hasSimpleAuth(projectSettings: ProjectSettingsV3): boolean;
 export declare function hasAzureResourceV3(projectSetting: ProjectSettingsV3, excludeAad?: boolean): boolean;
+export declare function hasSPFxTab(projectSetting: ProjectSettingsV3): boolean;
 //# sourceMappingURL=projectSettingsHelperV3.d.ts.map

package/build/common/projectSettingsHelperV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsHelperV3.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelperV3.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAK9F;AAED,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,cAAc,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAI1E;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,WAAW,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGvE;AACD,wBAAgB,aAAa,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGzE;AACD,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,UAAU,UAAQ,GAAG,OAAO,CAejG"}
+{"version":3,"file":"projectSettingsHelperV3.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelperV3.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAK9F;AAED,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,WAAW,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGvE;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,cAAc,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAI1E;AACD,wBAAgB,MAAM,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGlE;AACD,wBAAgB,WAAW,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGvE;AACD,wBAAgB,aAAa,CAAC,eAAe,EAAE,iBAAiB,GAAG,OAAO,CAGzE;AACD,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,UAAU,UAAQ,GAAG,OAAO,CAejG;AACD,wBAAgB,UAAU,CAAC,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAGrE"}

package/build/common/projectSettingsHelperV3.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasAzureResourceV3 = exports.hasSimpleAuth = exports.hasFunction = exports.hasAAD = exports.hasFunctionBot = exports.hasBot = exports.hasTab = exports.validateProjectSettings = void 0;
+exports.hasSPFxTab = exports.hasAzureResourceV3 = exports.hasSimpleAuth = exports.hasFunction = exports.hasAAD = exports.hasFunctionBot = exports.hasBot = exports.hasAzureTab = exports.hasTab = exports.validateProjectSettings = void 0;
 const constants_1 = require("../component/constants");
 const workflow_1 = require("../component/workflow");
 function validateProjectSettings(projectSettings) {
@@ -17,6 +17,11 @@ function hasTab(projectSettings) {
     return components.filter((c) => c.name === constants_1.ComponentNames.TeamsTab).length > 0;
 }
 exports.hasTab = hasTab;
+function hasAzureTab(projectSettings) {
+    const tab = workflow_1.getComponent(projectSettings, constants_1.ComponentNames.TeamsTab);
+    return tab !== undefined && tab.hosting !== constants_1.ComponentNames.SPFx;
+}
+exports.hasAzureTab = hasAzureTab;
 function hasBot(projectSettings) {
     const components = projectSettings.components;
     return components.filter((c) => c.name === constants_1.ComponentNames.TeamsBot).length > 0;
@@ -61,4 +66,9 @@ function hasAzureResourceV3(projectSetting, excludeAad = false) {
     return filtered.length > 0;
 }
 exports.hasAzureResourceV3 = hasAzureResourceV3;
+function hasSPFxTab(projectSetting) {
+    const tab = workflow_1.getComponent(projectSetting, constants_1.ComponentNames.TeamsTab);
+    return (tab === null || tab === void 0 ? void 0 : tab.hosting) === constants_1.ComponentNames.SPFx;
+}
+exports.hasSPFxTab = hasSPFxTab;
 //# sourceMappingURL=projectSettingsHelperV3.js.map

package/build/common/projectSettingsHelperV3.js.map

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

package/build/common/templates-config.json

@@ -1,6 +1,6 @@
 {
-    "version": "0.0.0-rc",
-    "tagPrefix": "templates@",
+    "version": "0.0.0-alpha",
+    "tagPrefix": "templates-",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
     "templateReleaseURL": "https://api.github.com/repos/OfficeDev/TeamsFx/releases/tags"

package/build/common/tools.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { AzureAccountProvider, ConfigMap, FxError, Json, Result, SubscriptionInfo, UserInteraction, ProjectSettings, AzureSolutionSettings, v2, Void, Inputs } from "@microsoft/teamsfx-api";
+import { AzureAccountProvider, ConfigMap, FxError, Json, Result, SubscriptionInfo, UserInteraction, ProjectSettings, AzureSolutionSettings, v2, Void, Inputs, M365TokenProvider } from "@microsoft/teamsfx-api";
 import { ExecOptions } from "child_process";
 export declare const Executor: {
     execCommandAsync(command: string, options?: ExecOptions | undefined): Promise<{
@@ -116,4 +116,5 @@ export declare const GraphScopes: string[];
 export declare const GraphReadUserScopes: string[];
 export declare const SPFxScopes: (tenant: string) => string[];
 export declare function getSPFxTenant(graphToken: string): Promise<string>;
+export declare function getSPFxToken(m365TokenProvider: M365TokenProvider): Promise<string | undefined>;
 //# sourceMappingURL=tools.d.ts.map

package/build/common/tools.d.ts.map

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

package/build/common/tools.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSideloadingStatus = exports.getAllowedAppMaps = exports.getAllowedAppIds = exports.redactObject = exports.IsSimpleAuthEnabled = exports.getHashedEnv = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.getAppStudioEndpoint = exports.getAppDirectory = exports.compileHandlebarsTemplateString = exports.generateBicepFromFile = exports.isGeneratorCheckerEnabled = exports.isYoCheckerEnabled = exports.canAddCICDWorkflows = exports.canAddApiConnection = exports.canAddSso = exports.isAADEnabled = exports.isApiConnectEnabled = exports.isM365AppEnabled = exports.isDeployManifestEnabled = exports.isAadManifestEnabled = exports.isExistingTabAppEnabled = exports.isConfigUnifyEnabled = exports.isBicepEnvCheckerEnabled = exports.isMultiEnvEnabled = exports.getResourceGroupInPortal = exports.askSubscription = exports.isCheckAccountError = exports.isUserCancelError = exports.deepCopy = exports.serializeDict = exports.replaceTemplateWithUserData = exports.convertDotenvToEmbeddedJson = exports.separateSecretData = exports.dataNeedEncryption = exports.AzurePortalUrl = exports.CryptoDataMatchers = exports.objectToConfigMap = exports.objectToMap = exports.mapToJson = exports.ensureUniqueFolder = exports.npmInstall = exports.Executor = void 0;
-exports.getSPFxTenant = exports.SPFxScopes = exports.GraphReadUserScopes = exports.GraphScopes = exports.AppStudioScopes = exports.getPropertyByPath = exports.undefinedName = exports.createV2Context = void 0;
+exports.getSPFxToken = exports.getSPFxTenant = exports.SPFxScopes = exports.GraphReadUserScopes = exports.GraphScopes = exports.AppStudioScopes = exports.getPropertyByPath = exports.undefinedName = exports.createV2Context = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -745,4 +745,19 @@ async function getSPFxTenant(graphToken) {
     return "";
 }
 exports.getSPFxTenant = getSPFxTenant;
+async function getSPFxToken(m365TokenProvider) {
+    const graphTokenRes = await m365TokenProvider.getAccessToken({
+        scopes: exports.GraphReadUserScopes,
+    });
+    let spoToken = undefined;
+    if (graphTokenRes && graphTokenRes.isOk()) {
+        const tenant = await getSPFxTenant(graphTokenRes.value);
+        const spfxTokenRes = await m365TokenProvider.getAccessToken({
+            scopes: exports.SPFxScopes(tenant),
+        });
+        spoToken = spfxTokenRes.isOk() ? spfxTokenRes.value : undefined;
+    }
+    return spoToken;
+}
+exports.getSPFxToken = getSPFxToken;
 //# sourceMappingURL=tools.js.map