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

package/build/common/local/localEnvManager.js

@@ -14,10 +14,45 @@ const portChecker_1 = require("./portChecker");
 const tools_1 = require("../tools");
 const crypto_1 = require("../../core/crypto");
 const error_1 = require("../../core/error");
+const depsChecker_1 = require("../deps-checker/depsChecker");
+const projectSettingsHelper_1 = require("./projectSettingsHelper");
+const localCertificateManager_1 = require("./localCertificateManager");
 class LocalEnvManager {
-    constructor(logger, telemetry) {
+    constructor(logger, telemetry, ui) {
         this.logger = logger;
         this.telemetry = telemetry;
+        this.ui = ui;
+    }
+    getActiveDependencies(projectSettings) {
+        const depsTypes = [];
+        const isSPFx = projectSettingsHelper_1.ProjectSettingsHelper.isSpfx(projectSettings);
+        const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
+        const includeSimpleAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeSimpleAuth(projectSettings);
+        const includeBackend = projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettings);
+        const includeBot = projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettings);
+        // NodeJS
+        if (isSPFx) {
+            depsTypes.push(depsChecker_1.DepsType.SpfxNode);
+        }
+        else if (includeBackend) {
+            depsTypes.push(depsChecker_1.DepsType.FunctionNode);
+        }
+        else {
+            depsTypes.push(depsChecker_1.DepsType.AzureNode);
+        }
+        // Dotnet
+        if ((includeFrontend && includeSimpleAuth) || includeBackend) {
+            depsTypes.push(depsChecker_1.DepsType.Dotnet);
+        }
+        // Function core tool
+        if (includeBackend) {
+            depsTypes.push(depsChecker_1.DepsType.FuncCoreTools);
+        }
+        // Ngrok
+        if (includeBot) {
+            depsTypes.push(depsChecker_1.DepsType.Ngrok);
+        }
+        return depsTypes;
     }
     async getLocalDebugEnvs(projectPath, projectSettings, localSettings) {
         return await localSettingsHelper_1.convertToLocalEnvs(projectPath, projectSettings, localSettings, this.logger);
@@ -26,7 +61,7 @@ class LocalEnvManager {
         return await npmLogHelper_1.getNpmInstallLogInfo();
     }
     async getPortsInUse(projectPath, projectSettings) {
-        return await portChecker_1.getPortsInUse(projectPath, projectSettings);
+        return await portChecker_1.getPortsInUse(projectPath, projectSettings, false, this.logger);
     }
     async getLocalSettings(projectPath, cryptoOption) {
         const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(projectPath);
@@ -49,6 +84,11 @@ class LocalEnvManager {
             }
         });
     }
+    async resolveLocalCertificate(trustDevCert) {
+        const certManager = new localCertificateManager_1.LocalCertificateManager(this.ui, this.logger);
+        const localCert = await certManager.setupCertificate(trustDevCert);
+        return localCert.isTrusted;
+    }
     // Retry logic when reading project config files in case of read-write conflict
     async retry(func) {
         let n = 0;

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

@@ -1 +1 @@
-{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,wDASgC;AAChC,qDAA+B;AAC/B,mDAA6B;AAE7B,+DAA2D;AAC3D,oEAAiE;AACjE,iDAAyE;AACzE,+CAA8C;AAC9C,oCAAuC;AACvC,8CAAgD;AAChD,4CAA6D;AAE7D,MAAa,eAAe;IAI1B,YAAY,MAAoB,EAAE,SAA6B;QAC7D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,WAAmB,EACnB,eAAgC,EAChC,aAA+B;QAE/B,OAAO,MAAM,wCAAkB,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5F,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,mCAAoB,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,WAAmB,EACnB,eAAgC;QAEhC,OAAO,MAAM,2BAAa,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAC3D,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,WAAmB,EACnB,YAAoC;QAEpC,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,oBAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAChG,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YACjC,OAAO,MAAM,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,WAAmB;QACjD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YACjC,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CACtC,WAAW,EACX,IAAI,8BAAgB,EAAE,EACtB,oCAAsB,EACtB,qCAAuB,CACxB,CAAC;YAEF,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE;gBAC/C,MAAM,IAAI,uBAAS,CACjB,mBAAmB,EACnB,yCAAyC,mBAAmB,EAAE,EAC9D,kBAAU,CACX,CAAC;aACH;YAED,IAAI;gBACF,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;aAC/C;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,qBAAa,CAAC,KAAK,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,+EAA+E;IACvE,KAAK,CAAC,KAAK,CAAI,IAAuC;QAC5D,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,EAAE;YACb,IAAI,CAAC,KAAK,CAAC,EAAE;gBACX,MAAM,mBAAW,CAAC,CAAC,CAAC,CAAC;aACtB;YAED,IAAI;gBACF,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;aACtB;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,GAAG,CAAC,CAAC;gBACV,EAAE,CAAC,CAAC;aACL;SACF;QACD,MAAM,KAAK,CAAC;IACd,CAAC;CACF;AAlFD,0CAkFC"}
+{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,5 @@
 import { LogProvider } from "@microsoft/teamsfx-api";
 export declare function loadPackageJson(path: string, logger?: LogProvider): Promise<any>;
 export declare function loadTeamsFxDevScript(componentRoot: string): Promise<string | undefined>;
+export declare function checkNpmDependencies(folder: string): Promise<boolean>;
 //# sourceMappingURL=packageJsonHelper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"packageJsonHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMrD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAatF;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7F"}
+{"version":3,"file":"packageJsonHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAOrD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAatF;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7F;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B3E"}

package/build/common/local/packageJsonHelper.js

@@ -2,10 +2,11 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTeamsFxDevScript = exports.loadPackageJson = void 0;
+exports.checkNpmDependencies = exports.loadTeamsFxDevScript = exports.loadPackageJson = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
+const Arborist = require("@npmcli/arborist");
 const npmRunDevRegex = /npm[\s]+run[\s]+dev/im;
 async function loadPackageJson(path, logger) {
     if (!(await fs.pathExists(path))) {
@@ -33,4 +34,31 @@ async function loadTeamsFxDevScript(componentRoot) {
     }
 }
 exports.loadTeamsFxDevScript = loadTeamsFxDevScript;
+async function checkNpmDependencies(folder) {
+    var _a;
+    if (await fs.pathExists(folder)) {
+        const packageJson = await loadPackageJson(path.join(folder, "package.json"));
+        if (((packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) && Object.keys(packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies).length > 0) ||
+            ((packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) && Object.keys(packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies).length > 0)) {
+            // load deps from node_modules
+            const arb = new Arborist({ path: folder });
+            try {
+                await arb.loadActual();
+            }
+            catch (error) {
+                return false;
+            }
+            // check if any missing dependency
+            const dependencies = ((_a = arb.actualTree) === null || _a === void 0 ? void 0 : _a.edgesOut) === undefined ? [] : [...arb.actualTree.edgesOut.values()];
+            return !dependencies.some((dependency) => dependency.error === "MISSING");
+        }
+        else {
+            // treat no deps as npm installed
+            return true;
+        }
+    }
+    // treat missing folder as npm installed
+    return true;
+}
+exports.checkNpmDependencies = checkNpmDependencies;
 //# sourceMappingURL=packageJsonHelper.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"packageJsonHelper.js","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,qDAA+B;AAC/B,mDAA6B;AAE7B,MAAM,cAAc,GAAG,uBAAuB,CAAC;AAExC,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,MAAoB;IACtE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;QAChC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iCAAiC,IAAI,mBAAmB,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9C,IAAI;QACF,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;KACxB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iCAAiC,IAAI,YAAY,KAAK,EAAE,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAbD,0CAaC;AAEM,KAAK,UAAU,oBAAoB,CAAC,aAAqB;IAC9D,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACpF,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC5E,MAAM,UAAU,GAAW,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9D,OAAO,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;KAClF;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AARD,oDAQC"}
+{"version":3,"file":"packageJsonHelper.js","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,3 @@
-import { ProjectSettings } from "@microsoft/teamsfx-api";
-export declare function getPortsInUse(projectPath: string, projectSettings: ProjectSettings, ignoreDebugPort?: boolean): Promise<number[]>;
+import { LogProvider, ProjectSettings } from "@microsoft/teamsfx-api";
+export declare function getPortsInUse(projectPath: string, projectSettings: ProjectSettings, ignoreDebugPort?: boolean, logger?: LogProvider): Promise<number[]>;
 //# sourceMappingURL=portChecker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB"}
+{"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAmB,MAAM,wBAAwB,CAAC;AA+CvF,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CA+CnB"}

package/build/common/local/portChecker.js

@@ -4,73 +4,56 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortsInUse = void 0;
 const tslib_1 = require("tslib");
-const net = tslib_1.__importStar(require("net"));
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const path = tslib_1.__importStar(require("path"));
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const constants_1 = require("./constants");
 const packageJsonHelper_1 = require("./packageJsonHelper");
 const projectSettingsHelper_1 = require("./projectSettingsHelper");
-const allAddressIPv4 = "0.0.0.0";
-const allAddressIPv6 = "::";
-const loopbackAddressIPv4 = "127.0.0.1";
-const loopbackAddressIPv6 = "::1";
-const hosts = [allAddressIPv4, loopbackAddressIPv4, allAddressIPv6, loopbackAddressIPv6];
-const frontendPortsV1 = [[3000, hosts]];
-const frontendPorts = [[53000, hosts]];
-const simpleAuthPorts = [[55000, hosts]];
+const error_1 = require("../../core/error");
+const telemetry_1 = require("../telemetry");
+const frontendPortsV1 = [3000];
+const frontendPorts = [53000];
+const simpleAuthPorts = [55000];
 const backendDebugPortRegex = /--inspect[\s]*=[\s"']*9229/im;
-const backendDebugPorts = [[9229, hosts]];
+const backendDebugPorts = [9229];
 const backendServicePortRegex = /--port[\s"']*7071/im;
-const backendServicePorts = [[7071, hosts]];
+const backendServicePorts = [7071];
 const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
-const botDebugPorts = [[9239, hosts]];
-const botServicePorts = [[3978, hosts]];
-async function detectPortListeningOnHosts(port, hosts) {
-    for (const host of hosts) {
-        if (await detectPortListening(port, host)) {
-            return true;
-        }
+const botDebugPorts = [9239];
+const botServicePorts = [3978];
+async function detectPortListening(port, logger) {
+    try {
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPortStart, { port: port.toString() });
+        const portChosen = await detect_port_1.default(port);
+        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPort, {
+            portChosen: portChosen.toString(),
+            port: port.toString(),
+        });
+        return portChosen !== port;
+    }
+    catch (error) {
+        // ignore any error to not block debugging
+        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DetectPort, teamsfx_api_1.returnUserError(error, error_1.CoreSource, "DetectPortError"));
+        logger === null || logger === void 0 ? void 0 : logger.warning(`Failed to detect port. ${error === null || error === void 0 ? void 0 : error.message} `);
+        return false;
     }
-    return false;
-}
-async function detectPortListening(port, host) {
-    return new Promise((resolve, _reject) => {
-        try {
-            const server = net.createServer();
-            server
-                .once("error", (err) => {
-                if (err.message.includes("EADDRINUSE")) {
-                    resolve(true);
-                }
-                else {
-                    resolve(false);
-                }
-            })
-                .once("listening", () => {
-                server.close();
-            })
-                .once("close", () => {
-                resolve(false);
-            })
-                .listen(port, host);
-        }
-        catch (err) {
-            // ignore any error to not block debugging
-            resolve(false);
-        }
-    });
 }
-async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
+async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort, logger) {
     const ports = [];
     const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
     if (includeFrontend) {
         const migrateFromV1 = projectSettingsHelper_1.ProjectSettingsHelper.isMigrateFromV1(projectSettings);
         if (!migrateFromV1) {
             ports.push(...frontendPorts);
-            ports.push(...simpleAuthPorts);
         }
         else {
             ports.push(...frontendPortsV1);
         }
+        const includeSimpleAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeSimpleAuth(projectSettings);
+        if (includeSimpleAuth) {
+            ports.push(...simpleAuthPorts);
+        }
     }
     const includeBackend = projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettings);
     if (includeBackend) {
@@ -94,8 +77,8 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
     }
     const portsInUse = [];
     for (const port of ports) {
-        if (await detectPortListeningOnHosts(port[0], port[1])) {
-            portsInUse.push(port[0]);
+        if (await detectPortListening(port, logger)) {
+            portsInUse.push(port);
         }
     }
     return portsInUse;

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../src/common/local/process.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmB/D;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB1D"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../src/common/local/process.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,0DAAoC;AAEpC;;;GAGG;AACH,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI;YACF,MAAM,SAAS,GAAG,qEAAqE,OAAO,GAAG,CAAC;YAClG,EAAE,CAAC,IAAI,CACL,SAAS,EACT,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EACrF,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC,CACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,wCAmBC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI;YACF,EAAE,CAAC,IAAI,CACL,OAAO,EACP,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EACrF,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC,CACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAlBD,8BAkBC"}

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

@@ -1,11 +1,11 @@
 import { ProjectSettings } from "@microsoft/teamsfx-api";
 export declare class ProjectSettingsHelper {
     static isSpfx: (projectSettings: ProjectSettings | undefined) => boolean;
-    static includeFrontend: (projectSettings: ProjectSettings | undefined) => boolean;
-    static includeBackend: (projectSettings: ProjectSettings | undefined) => boolean;
-    static includeBot: (projectSettings: ProjectSettings | undefined) => boolean;
-    static includeAAD(projectSettings: ProjectSettings | undefined): boolean;
-    static includeSimpleAuth(projectSettings: ProjectSettings | undefined): boolean;
+    static includeFrontend(projectSettings: ProjectSettings | undefined): boolean;
+    static includeBackend(projectSettings: ProjectSettings | undefined): boolean;
+    static includeBot(projectSettings: ProjectSettings | undefined): boolean;
+    static includeAAD: (projectSettings: ProjectSettings | undefined) => boolean;
+    static includeSimpleAuth: (projectSettings: ProjectSettings | undefined) => boolean;
     static isMigrateFromV1: (projectSettings: ProjectSettings | undefined) => boolean;
 }
 //# sourceMappingURL=projectSettingsHelper.d.ts.map

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;AAIhF,qBAAa,qBAAqB;IAChC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAG1E;IAEJ,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGnF;IAEJ,OAAc,cAAc,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGlF;IAEJ,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAG9E;WAEU,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAMjE,iBAAiB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAKtF,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAClC;CACtD"}
+{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAWhF,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,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAK/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGvD;IAE3B,OAAc,iBAAiB,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGhD;IAEzC,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAClC;CACtD"}

package/build/common/local/projectSettingsHelper.js

@@ -3,35 +3,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectSettingsHelper = void 0;
-const constants_1 = require("../constants");
+const question_1 = require("../../plugins/solution/fx-solution/question");
 const tools_1 = require("../tools");
 class ProjectSettingsHelper {
-    static includeAAD(projectSettings) {
-        var _a;
-        const selectedPlugins = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
-        return selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.some((pluginName) => pluginName === constants_1.ResourcePlugins.Aad);
+    static includeFrontend(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) {
+        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 &&
+            azureResources.includes(question_1.AzureResourceFunction.id));
     }
-    static includeSimpleAuth(projectSettings) {
-        const includeSimpleAuth = tools_1.IsSimpleAuthEnabled(projectSettings);
-        return !this.includeFrontend(projectSettings) || includeSimpleAuth;
+    static includeBot(projectSettings) {
+        var _a;
+        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);
     }
 }
 exports.ProjectSettingsHelper = ProjectSettingsHelper;
+// keep the same logic as plugin.activate()
 ProjectSettingsHelper.isSpfx = (projectSettings) => {
-    var _a, _b;
-    return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.SPFx));
-};
-ProjectSettingsHelper.includeFrontend = (projectSettings) => {
-    var _a, _b;
-    return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.FrontendHosting));
-};
-ProjectSettingsHelper.includeBackend = (projectSettings) => {
-    var _a, _b;
-    return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.Function));
+    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;
 };
-ProjectSettingsHelper.includeBot = (projectSettings) => {
-    var _a, _b;
-    return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.Bot));
+ProjectSettingsHelper.includeAAD = (projectSettings) => {
+    var _a;
+    return !ProjectSettingsHelper.isMigrateFromV1(projectSettings) &&
+        ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.hostType) ===
+            question_1.HostTypeOptionAzure.id;
 };
+ProjectSettingsHelper.includeSimpleAuth = (projectSettings) => 
+// TODO: update this when retiring simple auth service
+!ProjectSettingsHelper.isMigrateFromV1(projectSettings) &&
+    !!tools_1.IsSimpleAuthEnabled(projectSettings);
 ProjectSettingsHelper.isMigrateFromV1 = (projectSettings) => { var _a; return !!((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.migrateFromV1); };
 //# 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,4CAA+C;AAC/C,oCAA+C;AAE/C,MAAa,qBAAqB;IAqBzB,MAAM,CAAC,UAAU,CAAC,eAA4C;;QACnE,MAAM,eAAe,GAAG,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAChF,qBAAqB,CAAC;QAC1B,OAAO,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,GAAG,CAAC,CAAC;IACnF,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,eAA4C;QAC1E,MAAM,iBAAiB,GAAG,2BAAmB,CAAC,eAAe,CAAC,CAAC;QAC/D,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,iBAAiB,CAAC;IACrE,CAAC;;AA9BH,sDAkCC;AAjCe,4BAAM,GAAG,CAAC,eAA4C,EAAW,EAAE;;IAC/E,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,IAAI,CACpD,CAAA,CAAA;CAAA,CAAC;AAEU,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACxF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,eAAe,CAC/D,CAAA,CAAA;CAAA,CAAC;AAEU,oCAAc,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACvF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,QAAQ,CACxD,CAAA,CAAA;CAAA,CAAC;AAEU,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACnF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,GAAG,CACnD,CAAA,CAAA;CAAA,CAAC;AAaU,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE,WACxF,OAAA,CAAC,CAAC,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,0CAAE,aAAa,CAAA,CAAA,EAAA,CAAC"}
+{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,oCAA+C;AAE/C,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,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;;AAxBH,sDAsCC;AArCC,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;AAsBV,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACnF,OAAA,CAAC,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC;QACvD,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,QAAQ;YACpE,8BAAmB,CAAC,EAAE,CAAA;CAAA,CAAC;AAEb,uCAAiB,GAAG,CAAC,eAA4C,EAAW,EAAE;AAC1F,sDAAsD;AACtD,CAAC,qBAAqB,CAAC,eAAe,CAAC,eAAe,CAAC;IACvD,CAAC,CAAC,2BAAmB,CAAC,eAAe,CAAC,CAAC;AAE3B,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE,WACxF,OAAA,CAAC,CAAC,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,0CAAE,aAAa,CAAA,CAAA,EAAA,CAAC"}

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

@@ -12,20 +12,13 @@ export interface ITaskDefinition {
         [key: string]: string;
     };
 }
-export declare class NpmTaskDefinition {
-    private static command;
-    private static nameSuffix;
-    static frontend(workspaceFolder: string, isWatchTask: boolean): ITaskDefinition;
-    static backend(workspaceFolder: string, isWatchTask: boolean, funcBinFolders: string[] | undefined): ITaskDefinition;
-    static bot(workspaceFolder: string, isWatchTask: boolean): ITaskDefinition;
-}
 export declare class TaskDefinition {
     static frontendStart(workspaceFolder: string): ITaskDefinition;
     static backendStart(workspaceFolder: string, programmingLanguage: string | undefined, funcCommand: string, enableLanguageWorker: boolean): ITaskDefinition;
     static backendWatch(workspaceFolder: string): ITaskDefinition;
     static authStart(dotnetExecPath: string, authServicePath: string | undefined): ITaskDefinition;
     static botStart(workspaceFolder: string, programmingLanguage: string | undefined, enableInspect: boolean): ITaskDefinition;
-    static ngrokStart(workspaceFolder: string, skipNgrok: boolean, ngrokBinFolder: string): ITaskDefinition;
+    static ngrokStart(workspaceFolder: string, skipNgrok: boolean, ngrokBinFolders: string[] | undefined): ITaskDefinition;
     static frontendInstall(workspaceFolder: string): ITaskDefinition;
     static backendInstall(workspaceFolder: string): ITaskDefinition;
     static backendExtensionsInstall(workspaceFolder: string, dotnetExecPath: string): ITaskDefinition;

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

@@ -1 +1 @@
-{"version":3,"file":"taskDefinition.d.ts","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE;QACX,SAAS,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjC;AAGD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,MAAM,CAAC,OAAO;IAItB,OAAO,CAAC,MAAM,CAAC,UAAU;IAIzB,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,eAAe;IAY/E,MAAM,CAAC,OAAO,CACZ,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,OAAO,EACpB,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,GACnC,eAAe;IAoBlB,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,eAAe;CAW3E;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY9D,MAAM,CAAC,YAAY,CACjB,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,GAC5B,eAAe;IAmBlB,MAAM,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY7D,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;IAa9F,MAAM,CAAC,QAAQ,CACb,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,EAAE,OAAO,GACrB,eAAe;IAkBlB,MAAM,CAAC,UAAU,CACf,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,OAAO,EAClB,cAAc,EAAE,MAAM,GACrB,eAAe;IAiBlB,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAYhE,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY/D,MAAM,CAAC,wBAAwB,CAC7B,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,eAAe;IAalB,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY3D,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY5D,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAczD,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;CAa3D"}
+{"version":3,"file":"taskDefinition.d.ts","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE;QACX,SAAS,EAAE,OAAO,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjC;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY9D,MAAM,CAAC,YAAY,CACjB,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,OAAO,GAC5B,eAAe;IAmBlB,MAAM,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY7D,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;IAa9F,MAAM,CAAC,QAAQ,CACb,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,EAAE,OAAO,GACrB,eAAe;IAkBlB,MAAM,CAAC,UAAU,CACf,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,OAAO,EAClB,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,GACpC,eAAe;IAqBlB,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAYhE,MAAM,CAAC,cAAc,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY/D,MAAM,CAAC,wBAAwB,CAC7B,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,GACrB,eAAe;IAalB,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY3D,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAY5D,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;IAczD,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe;CAa3D"}

package/build/common/local/taskDefinition.js

@@ -2,61 +2,11 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TaskDefinition = exports.NpmTaskDefinition = void 0;
+exports.TaskDefinition = void 0;
 const tslib_1 = require("tslib");
 const constants_1 = require("./constants");
 const path_1 = tslib_1.__importDefault(require("path"));
 const system_1 = require("../deps-checker/util/system");
-// This type of task executes npm script of each component.
-class NpmTaskDefinition {
-    static command(isWatchTask) {
-        return isWatchTask ? "npm run watch:teamsfx" : "npm run dev:teamsfx";
-    }
-    static nameSuffix(isWatchTask) {
-        return isWatchTask ? "watch" : "dev";
-    }
-    static frontend(workspaceFolder, isWatchTask) {
-        return {
-            name: `frontend ${NpmTaskDefinition.nameSuffix(isWatchTask)}`,
-            command: NpmTaskDefinition.command(isWatchTask),
-            cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Frontend),
-            execOptions: {
-                needShell: true,
-            },
-            isBackground: true,
-        };
-    }
-    static backend(workspaceFolder, isWatchTask, funcBinFolders) {
-        var _a;
-        return {
-            name: `backend ${NpmTaskDefinition.nameSuffix(isWatchTask)}`,
-            command: NpmTaskDefinition.command(isWatchTask),
-            cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Function),
-            execOptions: {
-                needShell: true,
-            },
-            isBackground: true,
-            env: funcBinFolders
-                ? {
-                    // put portable func at the end since func checker prefers global func
-                    PATH: `${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}${path_1.default.delimiter}${funcBinFolders.join(path_1.default.delimiter)}`,
-                }
-                : undefined,
-        };
-    }
-    static bot(workspaceFolder, isWatchTask) {
-        return {
-            name: `bot ${NpmTaskDefinition.nameSuffix(isWatchTask)}`,
-            command: NpmTaskDefinition.command(isWatchTask),
-            cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Bot),
-            execOptions: {
-                needShell: true,
-            },
-            isBackground: true,
-        };
-    }
-}
-exports.NpmTaskDefinition = NpmTaskDefinition;
 class TaskDefinition {
     static frontendStart(workspaceFolder) {
         return {
@@ -125,16 +75,18 @@ class TaskDefinition {
             isBackground: true,
         };
     }
-    static ngrokStart(workspaceFolder, skipNgrok, ngrokBinFolder) {
+    static ngrokStart(workspaceFolder, skipNgrok, ngrokBinFolders) {
         var _a;
         return {
             name: "ngrok start",
             command: skipNgrok
                 ? "echo 'Skip starting ngrok, and will use predefined bot endpoint.'"
-                : "npx ngrok http 3978 --log=stdout",
-            env: {
-                PATH: `${ngrokBinFolder}${path_1.default.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`,
-            },
+                : "ngrok http 3978 --log=stdout",
+            env: ngrokBinFolders
+                ? {
+                    PATH: `${ngrokBinFolders.join(path_1.default.delimiter)}${path_1.default.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`,
+                }
+                : undefined,
             cwd: path_1.default.join(workspaceFolder, constants_1.FolderName.Bot),
             execOptions: {
                 needShell: true,

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

@@ -1 +1 @@
-{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,2CAAiF;AACjF,wDAAwB;AACxB,wDAAwD;AAexD,2DAA2D;AAC3D,MAAa,iBAAiB;IACpB,MAAM,CAAC,OAAO,CAAC,WAAoB;QACzC,OAAO,WAAW,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACvE,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,WAAoB;QAC5C,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,eAAuB,EAAE,WAAoB;QAC3D,OAAO;YACL,IAAI,EAAE,YAAY,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC7D,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/C,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,OAAO,CACZ,eAAuB,EACvB,WAAoB,EACpB,cAAoC;;QAEpC,OAAO;YACL,IAAI,EAAE,WAAW,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC5D,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/C,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;YAClB,GAAG,EAAE,cAAc;gBACjB,CAAC,CAAC;oBACE,sEAAsE;oBACtE,IAAI,EAAE,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EAAE,GAAG,cAAI,CAAC,SAAS,GAAG,cAAc,CAAC,IAAI,CACpE,cAAI,CAAC,SAAS,CACf,EAAE;iBACJ;gBACH,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,eAAuB,EAAE,WAAoB;QACtD,OAAO;YACL,IAAI,EAAE,OAAO,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACxD,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/C,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;CACF;AAxDD,8CAwDC;AAED,MAAa,cAAc;IACzB,MAAM,CAAC,aAAa,CAAC,eAAuB;QAC1C,OAAO;YACL,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,yBAAyB;YAClC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CACjB,eAAuB,EACvB,mBAAuC,EACvC,WAAmB,EACnB,oBAA6B;QAE7B,yGAAyG;QACzG,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,IAAI,GACR,mBAAmB,KAAK,+BAAmB,CAAC,UAAU;YACpD,CAAC,CAAC,sBAAsB,iBAAiB,2BAA2B;YACpE,CAAC,CAAC,sBAAsB,iBAAiB,2BAA2B,CAAC;QACzE,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,GAAG,WAAW,IAAI,IAAI,EAAE;YACjC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,kBAAS,EAAE;aACrB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,eAAuB;QACzC,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,iBAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,cAAsB,EAAE,eAAmC;QAC1E,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,CAAC,kCAAkC,CAAC;YAC1C,GAAG,EAAE,eAAe;YACpB,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CACb,eAAuB,EACvB,mBAAuC,EACvC,aAAsB;QAEtB,sEAAsE;QACtE,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,MAAM,OAAO,GACX,mBAAmB,KAAK,+BAAmB,CAAC,UAAU;YACpD,CAAC,CAAC,2BAA2B,UAAU,+CAA+C;YACtF,CAAC,CAAC,eAAe,UAAU,2BAA2B,CAAC;QAC3D,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CACf,eAAuB,EACvB,SAAkB,EAClB,cAAsB;;QAEtB,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,SAAS;gBAChB,CAAC,CAAC,mEAAmE;gBACrE,CAAC,CAAC,kCAAkC;YACtC,GAAG,EAAE;gBACH,IAAI,EAAE,GAAG,cAAc,GAAG,cAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EAAE,EAAE;aACpE;YACD,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,CAAC,SAAS;SACzB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,eAAuB;QAC5C,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,eAAuB;QAC3C,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,wBAAwB,CAC7B,eAAuB,EACvB,cAAsB;QAEtB,OAAO;YACL,IAAI,EAAE,4BAA4B;YAClC,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,yBAAyB,CAAC;YAC5E,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,eAAuB;QACvC,OAAO;YACL,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,eAAuB;QACxC,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC;YAChD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,eAAuB;QACrC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,CAAC,GAAG,QAAQ,gCAAgC,EAAE,gBAAgB,EAAE,YAAY,CAAC;YACnF,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,eAAuB;QACtC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,CAAC,GAAG,QAAQ,gCAAgC,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC;YACzF,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;CACF;AApMD,wCAoMC"}
+{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"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"}

package/build/common/localSettingsConstants.d.ts

@@ -10,6 +10,8 @@ export declare const LocalSettingsAuthKeys: Readonly<{
     OauthAuthority: string;
     OauthHost: string;
     ApplicationIdUris: string;
+}>;
+export declare const LocalSettingsSimpleAuthKeys: Readonly<{
     SimpleAuthFilePath: string;
     SimpleAuthEnvironmentVariableParams: string;
     SimpleAuthServiceEndpoint: string;
@@ -17,9 +19,9 @@ export declare const LocalSettingsAuthKeys: Readonly<{
 export declare const LocalSettingsFrontendKeys: Readonly<{
     TabDomain: string;
     TabEndpoint: string;
+    TabIndexPath: string;
     Browser: string;
     Https: string;
-    TrustDevCert: string;
     SslCertFile: string;
     SslKeyFile: string;
 }>;
@@ -32,7 +34,6 @@ export declare const LocalSettingsBackendKeys: Readonly<{
     SqlPassword: string;
 }>;
 export declare const LocalSettingsBotKeys: Readonly<{
-    SkipNgrok: string;
     BotId: string;
     BotPassword: string;
     BotAadObjectId: string;

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

@@ -1 +1 @@
-{"version":3,"file":"localSettingsConstants.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;EAInC,CAAC"}
+{"version":3,"file":"localSettingsConstants.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;EAQhC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;EAItC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;EAO/B,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;EAInC,CAAC"}