@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.c8083c82.0

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

@@ -1,6 +1,7 @@
 import { Json, LogProvider, ProjectSettings, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
 import { NpmInstallLogInfo } from "./npmLogHelper";
 import { DepsType } from "../deps-checker/depsChecker";
+import { LocalCertificate } from "./localCertificateManager";
 export declare class LocalEnvManager {
     private readonly logger;
     private readonly telemetry;
@@ -14,7 +15,7 @@ export declare class LocalEnvManager {
         projectId: string;
     }): Promise<Json | undefined>;
     getProjectSettings(projectPath: string): Promise<ProjectSettings>;
-    resolveLocalCertificate(trustDevCert: boolean): Promise<boolean | undefined>;
+    resolveLocalCertificate(trustDevCert: boolean): Promise<LocalCertificate>;
     private retry;
 }
 //# sourceMappingURL=localEnvManager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"localEnvManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAEf,iBAAiB,EAEjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAwB,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAKzE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAIvD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA8B;gBAErC,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,EAAE,eAAe;IAM9E,qBAAqB,CAAC,eAAe,EAAE,eAAe,GAAG,QAAQ,EAAE;IAmC7D,iBAAiB,CAC5B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAIrB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAI9D,aAAa,CACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;IAIP,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GACnC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAQf,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBjE,uBAAuB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;YAO3E,KAAK;CAiBpB"}
+{"version":3,"file":"localEnvManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAEf,iBAAiB,EAEjB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAMhC,OAAO,EAAwB,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAKzE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,2BAA2B,CAAC;AAEtF,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgC;IAC1D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA8B;gBAErC,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,EAAE,eAAe;IAM9E,qBAAqB,CAAC,eAAe,EAAE,eAAe,GAAG,QAAQ,EAAE;IAmC7D,iBAAiB,CAC5B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,GAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAIrB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAI9D,aAAa,CACxB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;IAIP,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,GACnC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAQf,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBjE,uBAAuB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAQxE,KAAK;CAiBpB"}

package/build/common/local/localEnvManager.js

@@ -61,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);
@@ -85,9 +85,10 @@ class LocalEnvManager {
         });
     }
     async resolveLocalCertificate(trustDevCert) {
-        const certManager = new localCertificateManager_1.LocalCertificateManager(this.ui, this.logger);
-        const localCert = await certManager.setupCertificate(trustDevCert);
-        return localCert.isTrusted;
+        // Do not print any log in LocalCertificateManager, use the error message returned instead.
+        const certManager = new localCertificateManager_1.LocalCertificateManager(this.ui);
+        const res = await certManager.setupCertificate(trustDevCert);
+        return res;
     }
     // Retry logic when reading project config files in case of read-write conflict
     async retry(func) {

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

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

package/build/common/local/localEnvProvider.js

@@ -12,7 +12,7 @@ const constants_1 = require("./constants");
 exports.EnvKeysFrontend = Object.freeze({
     Browser: "BROWSER",
     Https: "HTTPS",
-    Port: "Port",
+    Port: "PORT",
     SslCrtFile: "SSL_CRT_FILE",
     SslKeyFile: "SSL_KEY_FILE",
     TeamsFxEndpoint: "REACT_APP_TEAMSFX_ENDPOINT",

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

@@ -1 +1 @@
-{"version":3,"file":"localSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAuChC,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8IjC"}
+{"version":3,"file":"localSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAChB,MAAM,wBAAwB,CAAC;AA0ChC,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8IjC"}

package/build/common/local/localSettingsHelper.js

@@ -6,6 +6,7 @@ exports.convertToLocalEnvs = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const os = tslib_1.__importStar(require("os"));
+const localSettingsConstants_1 = require("../localSettingsConstants");
 const tools_1 = require("../tools");
 const constants_1 = require("./constants");
 const localEnvProvider_1 = require("./localEnvProvider");
@@ -38,17 +39,17 @@ async function convertToLocalEnvs(projectPath, projectSettings, localSettings, l
     const frontendConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.frontend);
     const teamsAppConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.teamsApp);
     // get config for local debug
-    const clientId = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ClientId);
-    const clientSecret = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ClientSecret);
-    const applicationIdUri = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ApplicationIdUris);
-    const teamsAppTenantId = teamsAppConfigs === null || teamsAppConfigs === void 0 ? void 0 : teamsAppConfigs.get(constants_1.LocalSettingsTeamsAppKeys.TenantId);
-    const localAuthEndpoint = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.SimpleAuthServiceEndpoint);
-    const localTabEndpoint = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.TabEndpoint);
-    const localFuncEndpoint = backendConfigs === null || backendConfigs === void 0 ? void 0 : backendConfigs.get(constants_1.LocalSettingsBackendKeys.FunctionEndpoint);
+    const clientId = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsAuthKeys.ClientId);
+    const clientSecret = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsAuthKeys.ClientSecret);
+    const applicationIdUri = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsAuthKeys.ApplicationIdUris);
+    const teamsAppTenantId = teamsAppConfigs === null || teamsAppConfigs === void 0 ? void 0 : teamsAppConfigs.get(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId);
+    const localAuthEndpoint = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(localSettingsConstants_1.LocalSettingsSimpleAuthKeys.SimpleAuthServiceEndpoint);
+    const localTabEndpoint = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.TabEndpoint);
+    const localFuncEndpoint = backendConfigs === null || backendConfigs === void 0 ? void 0 : backendConfigs.get(localSettingsConstants_1.LocalSettingsBackendKeys.FunctionEndpoint);
     const localEnvs = {};
     if (includeFrontend) {
-        localEnvs[constants_1.LocalEnvFrontendKeys.Browser] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.Browser);
-        localEnvs[constants_1.LocalEnvFrontendKeys.Https] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.Https);
+        localEnvs[constants_1.LocalEnvFrontendKeys.Browser] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.Browser);
+        localEnvs[constants_1.LocalEnvFrontendKeys.Https] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.Https);
         if (!isMigrateFromV1) {
             localEnvs[constants_1.LocalEnvFrontendKeys.Port] = "53000";
         }
@@ -84,23 +85,23 @@ async function convertToLocalEnvs(projectPath, projectSettings, localSettings, l
             localEnvs[constants_1.LocalEnvBackendKeys.ApplicationIdUri] = applicationIdUri;
             localEnvs[constants_1.LocalEnvBackendKeys.AllowedAppIds] = tools_1.getAllowedAppIds().join(";");
         }
-        localEnvs[constants_1.LocalEnvCertKeys.SslCrtFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.SslCertFile);
-        localEnvs[constants_1.LocalEnvCertKeys.SslKeyFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.SslKeyFile);
+        localEnvs[constants_1.LocalEnvCertKeys.SslCrtFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.SslCertFile);
+        localEnvs[constants_1.LocalEnvCertKeys.SslKeyFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(localSettingsConstants_1.LocalSettingsFrontendKeys.SslKeyFile);
     }
     if (includeBot) {
         // bot local env
         if (projectSettingsHelper_1.ProjectSettingsHelper.isMigrateFromV1(projectSettings)) {
-            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotId);
-            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotPassword);
+            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotId);
+            localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotPassword);
         }
         else {
-            localEnvs[constants_1.LocalEnvBotKeys.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotId);
-            localEnvs[constants_1.LocalEnvBotKeys.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotPassword);
+            localEnvs[constants_1.LocalEnvBotKeys.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotId);
+            localEnvs[constants_1.LocalEnvBotKeys.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotPassword);
             localEnvs[constants_1.LocalEnvBotKeys.ClientId] = clientId;
             localEnvs[constants_1.LocalEnvBotKeys.ClientSecret] = clientSecret;
             localEnvs[constants_1.LocalEnvBotKeys.TenantID] = teamsAppTenantId;
             localEnvs[constants_1.LocalEnvBotKeys.OauthAuthority] = "https://login.microsoftonline.com";
-            localEnvs[constants_1.LocalEnvBotKeys.LoginEndpoint] = `${botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotEndpoint)}/auth-start.html`;
+            localEnvs[constants_1.LocalEnvBotKeys.LoginEndpoint] = `${botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(localSettingsConstants_1.LocalSettingsBotKeys.BotEndpoint)}/auth-start.html`;
             localEnvs[constants_1.LocalEnvBotKeys.ApplicationIdUri] = applicationIdUri;
         }
         if (includeBackend) {

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

@@ -1 +1 @@
-{"version":3,"file":"localSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"localSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.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;AA6BzD,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,11 +4,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortsInUse = void 0;
 const tslib_1 = require("tslib");
+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 error_1 = require("../../core/error");
+const telemetry_1 = require("../telemetry");
 const frontendPortsV1 = [3000];
 const frontendPorts = [53000];
 const simpleAuthPorts = [55000];
@@ -19,28 +22,38 @@ const backendServicePorts = [7071];
 const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
 const botDebugPorts = [9239];
 const botServicePorts = [3978];
-async function detectPortListening(port) {
+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 (_a) {
+    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;
     }
 }
-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) {
@@ -64,7 +77,7 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
     }
     const portsInUse = [];
     for (const port of ports) {
-        if (await detectPortListening(port)) {
+        if (await detectPortListening(port, logger)) {
             portsInUse.push(port);
         }
     }

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/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;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"}
+{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAYhF,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,CAI9E;IAEJ,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

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectSettingsHelper = void 0;
 const question_1 = require("../../plugins/solution/fx-solution/question");
+const constants_1 = require("../constants");
 const tools_1 = require("../tools");
 class ProjectSettingsHelper {
     static includeFrontend(projectSettings) {
@@ -31,10 +32,9 @@ ProjectSettingsHelper.isSpfx = (projectSettings) => {
         question_1.HostTypeOptionSPFx.id;
 };
 ProjectSettingsHelper.includeAAD = (projectSettings) => {
-    var _a;
+    var _a, _b;
     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;
+        !!((_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.includes(constants_1.ResourcePlugins.Aad));
 };
 ProjectSettingsHelper.includeSimpleAuth = (projectSettings) => 
 // TODO: update this when retiring simple auth service

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,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"}
+{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,4CAA+C;AAC/C,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,sDAuCC;AAtCC,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,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,QAAQ,CAC7F,2BAAe,CAAC,GAAG,CACpB,CAAA,CAAA;CAAA,CAAC;AAEU,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,13 +12,6 @@ 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;

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,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"}
+{"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 {

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

@@ -1 +1 @@
-{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"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"}
+{"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,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,eAAqC;;QAErC,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,SAAS;gBAChB,CAAC,CAAC,mEAAmE;gBACrE,CAAC,CAAC,8BAA8B;YAClC,GAAG,EAAE,eAAe;gBAClB,CAAC,CAAC;oBACE,IAAI,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,GAAG,cAAI,CAAC,SAAS,GAC5D,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EACtB,EAAE;iBACH;gBACH,CAAC,CAAC,SAAS;YACb,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;AAxMD,wCAwMC"}

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;
@@ -20,20 +22,14 @@ export declare const LocalSettingsFrontendKeys: Readonly<{
     TabIndexPath: string;
     Browser: string;
     Https: string;
-    TrustDevCert: string;
     SslCertFile: string;
     SslKeyFile: string;
 }>;
 export declare const LocalSettingsBackendKeys: Readonly<{
     FunctionEndpoint: string;
     FunctionName: string;
-    SqlEndpoint: string;
-    SqlDatabaseName: string;
-    SqlUserName: string;
-    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;;;;;;;;;EASpC,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;;;EAGnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;EAO/B,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;EAInC,CAAC"}

package/build/common/localSettingsConstants.js

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
+exports.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsSimpleAuthKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
 exports.LocalSettingsTeamsAppKeys = Object.freeze({
     TenantId: "tenantId",
     TeamsAppId: "teamsAppId",
@@ -15,6 +15,8 @@ exports.LocalSettingsAuthKeys = Object.freeze({
     OauthAuthority: "oauthAuthority",
     OauthHost: "oauthHost",
     ApplicationIdUris: "applicationIdUris",
+});
+exports.LocalSettingsSimpleAuthKeys = Object.freeze({
     SimpleAuthFilePath: "simpleAuthFilePath",
     SimpleAuthEnvironmentVariableParams: "SimpleAuthEnvironmentVariableParams",
     SimpleAuthServiceEndpoint: "AuthServiceEndpoint",
@@ -25,20 +27,14 @@ exports.LocalSettingsFrontendKeys = Object.freeze({
     TabIndexPath: "tabIndexPath",
     Browser: "browser",
     Https: "https",
-    TrustDevCert: "trustDevCert",
     SslCertFile: "sslCertFile",
     SslKeyFile: "sslKeyFile",
 });
 exports.LocalSettingsBackendKeys = Object.freeze({
     FunctionEndpoint: "functionEndpoint",
     FunctionName: "functionName",
-    SqlEndpoint: "sqlEndpoint",
-    SqlDatabaseName: "sqlDatabaseName",
-    SqlUserName: "sqlUserName",
-    SqlPassword: "sqlPassword",
 });
 exports.LocalSettingsBotKeys = Object.freeze({
-    SkipNgrok: "skipNgrok",
     BotId: "botId",
     BotPassword: "botPassword",
     BotAadObjectId: "botAadObjectId",

package/build/common/localSettingsConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsConstants.js","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,YAAY,EAAE,cAAc;IAC5B,mCAAmC,EAAE,qCAAqC;IAC1E,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC"}
+{"version":3,"file":"localSettingsConstants.js","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;CACvC,CAAC,CAAC;AAEU,QAAA,2BAA2B,GAAG,MAAM,CAAC,MAAM,CAAC;IACvD,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;CAC7B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,YAAY,EAAE,cAAc;IAC5B,mCAAmC,EAAE,qCAAqC;IAC1E,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC"}

package/build/common/localSettingsProvider.d.ts

@@ -3,8 +3,8 @@ export declare const localSettingsFileName = "localSettings.json";
 export declare class LocalSettingsProvider {
     readonly localSettingsFilePath: string;
     constructor(workspaceFolder: string);
-    init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): LocalSettings;
-    initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): Json;
+    init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean, includeSimpleAuth?: boolean, includeAAD?: boolean): LocalSettings;
+    initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean, includeSimpleAuth?: boolean, includeAAD?: boolean): Json;
     incrementalInitV2(localSettingsJson: Json, addBackaned: boolean, addBot: boolean, addFrontend: boolean): Json;
     load(cryptoProvider?: CryptoProvider): Promise<LocalSettings | undefined>;
     loadV2(cryptoProvider?: CryptoProvider): Promise<Json | undefined>;
@@ -13,7 +13,7 @@ export declare class LocalSettingsProvider {
     saveJson(localSettingsJson: Json, cryptoProvider?: CryptoProvider): Promise<Json>;
     private convertToLocalSettings;
     convertToLocalSettingsJson(localSettings: LocalSettings): Json;
-    initSimpleAuth(): ConfigMap;
+    initAuth(includeSimpleAuth?: boolean): ConfigMap;
     initFrontend(): ConfigMap;
     initBackend(): ConfigMap;
     initBot(): ConfigMap;

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

@@ -1 +1 @@
-{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAUhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,GACpB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,GACpB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAc/E,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,cAAc,IAAI,SAAS;IAW3B,YAAY,IAAI,SAAS;IAczB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CAarB"}
+{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAWhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,EACrB,iBAAiB,UAAQ,EACzB,UAAU,UAAO,GAChB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,EACrB,iBAAiB,UAAQ,EACzB,UAAU,UAAO,GAChB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAc/E,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,QAAQ,CAAC,iBAAiB,UAAQ,GAAG,SAAS;IAmB9C,YAAY,IAAI,SAAS;IAazB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CASrB"}