npm - @microsoft/teamsfx-core - Versions diffs - 2.0.1 → 2.0.2-alpha.21023e5be.0 - Mend

@microsoft/teamsfx-core 2.0.1 → 2.0.2-alpha.21023e5be.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1901) hide show

package/build/common/local/localEnvManager.js CHANGED Viewed

@@ -7,131 +7,20 @@ const tslib_1 = require("tslib");
 const commentJson = tslib_1.__importStar(require("comment-json"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
-const localStateHelper = tslib_1.__importStar(require("./localStateHelper"));
-const localSettingsProvider_1 = require("../localSettingsProvider");
 const npmLogHelper_1 = require("./npmLogHelper");
 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");
-const depsManager_1 = require("../deps-checker/depsManager");
-const localStateProvider_1 = require("../localStateProvider");
-const projectSettingsLoader_1 = require("../../core/middleware/projectSettingsLoader");
-const migrate_1 = require("../../component/migrate");
-const ngrok_1 = require("../../component/debug/util/ngrok");
-const localEnvProvider_1 = require("../../component/debugHandler/localEnvProvider");
-const common_1 = require("../../error/common");
 class LocalEnvManager {
     constructor(logger, telemetry, ui) {
         this.logger = logger;
         this.telemetry = telemetry;
         this.ui = ui;
     }
-    async 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);
-        const includeFuncHostedBot = projectSettingsHelper_1.ProjectSettingsHelper.includeFuncHostedBot(projectSettings);
-        // NodeJS
-        if (isSPFx) {
-            depsTypes.push(depsChecker_1.DepsType.SpfxNode);
-        }
-        else {
-            depsTypes.push(depsChecker_1.DepsType.AzureNode);
-        }
-        // Dotnet
-        if ((includeFrontend && includeSimpleAuth) || includeBackend) {
-            depsTypes.push(depsChecker_1.DepsType.Dotnet);
-        }
-        // Function core tool
-        if (includeBackend || includeFuncHostedBot) {
-            depsTypes.push(depsChecker_1.DepsType.FuncCoreTools);
-        }
-        // Ngrok
-        if (includeBot) {
-            depsTypes.push(depsChecker_1.DepsType.Ngrok);
-        }
-        return depsManager_1.DepsManager.sortBySequence(depsTypes);
-    }
-    async getLocalDebugEnvs(projectPath, projectSettings, localSettings, envInfo) {
-        return await localStateHelper.convertToLocalEnvs(projectPath, projectSettings, envInfo, this.logger);
-    }
     async getNpmInstallLogInfo() {
         return await npmLogHelper_1.getNpmInstallLogInfo();
     }
-    async getPortsFromProject(projectPath, projectSettings) {
-        return await portChecker_1.getPortsFromProject(projectPath, projectSettings, false);
-    }
     async getPortsInUse(ports) {
         return await portChecker_1.getPortsInUse(ports, this.logger);
     }
-    async getNgrokTunnelFromApi(webServiceUrl) {
-        return await ngrok_1.getNgrokTunnelFromApi(webServiceUrl);
-    }
-    async getLocalSettings(projectPath, cryptoOption) {
-        const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(projectPath);
-        const crypto = cryptoOption === undefined ? undefined : new crypto_1.LocalCrypto(cryptoOption.projectId);
-        return await this.retry(async () => {
-            return await localSettingsProvider.loadV2(crypto);
-        });
-    }
-    async getLocalEnvInfo(projectPath, cryptoOption) {
-        const localStateProvider = new localStateProvider_1.LocalStateProvider(projectPath);
-        const crypto = new crypto_1.LocalCrypto(cryptoOption.projectId);
-        return await this.retry(async () => {
-            const envInfo = await localStateProvider.loadV2(crypto);
-            if (envInfo) {
-                // for v3, this envInfo is exported to outside of fx-core, we need to revert it into old pattern
-                envInfo.state = migrate_1.convertEnvStateV3ToV2(envInfo.state);
-            }
-            return envInfo;
-        });
-    }
-    async getProjectSettings(projectPath) {
-        return await this.retry(async () => {
-            const projectSettingsPath = projectSettingsLoader_1.getProjectSettingsPath(projectPath);
-            if (!(await fs.pathExists(projectSettingsPath))) {
-                throw new common_1.FileNotFoundError(error_1.CoreSource, projectSettingsPath);
-            }
-            try {
-                const res = await projectSettingsLoader_1.loadProjectSettingsByProjectPath(projectPath, true);
-                if (res.isErr()) {
-                    throw res.error;
-                }
-                return res.value;
-            }
-            catch (error) {
-                throw error_1.ReadFileError(error);
-            }
-        });
-    }
-    async resolveLocalCertificate(workspacePath, trustDevCert, localEnvProvider) {
-        // 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);
-        if (trustDevCert && localEnvProvider) {
-            const isVideoFilter = await tools_1.isVideoFilterProject(workspacePath);
-            if (isVideoFilter.isOk() && isVideoFilter.value) {
-                const videoFilterEnvs = await localEnvProvider.loadVideoFilterLocalEnvs();
-                videoFilterEnvs.template[localEnvProvider_1.LocalEnvKeys.videoFilterApp.template.SslCrtFile] = res.certPath;
-                videoFilterEnvs.template[localEnvProvider_1.LocalEnvKeys.videoFilterApp.template.SslKeyFile] = res.keyPath;
-                await localEnvProvider.saveVideoFilterLocalEnvs(videoFilterEnvs);
-            }
-            else {
-                const frontendEnvs = await localEnvProvider.loadFrontendLocalEnvs();
-                frontendEnvs.template[localEnvProvider_1.LocalEnvKeys.frontend.template.SslCrtFile] = res.certPath;
-                frontendEnvs.template[localEnvProvider_1.LocalEnvKeys.frontend.template.SslKeyFile] = res.keyPath;
-                await localEnvProvider.saveFrontendLocalEnvs(frontendEnvs);
-            }
-        }
-        return res;
-    }
     async getTaskJson(projectPath) {
         try {
             const taskFilePath = path.resolve(projectPath, ".vscode", "tasks.json");
@@ -142,24 +31,6 @@ class LocalEnvManager {
             return undefined;
         }
     }
-    // Retry logic when reading project config files in case of read-write conflict
-    async retry(func) {
-        let n = 0;
-        let error = undefined;
-        while (n <= 2) {
-            if (n !== 0) {
-                await tools_1.waitSeconds(n);
-            }
-            try {
-                return await func(n);
-            }
-            catch (e) {
-                error = e;
-                ++n;
-            }
-        }
-        throw error;
-    }
 }
 exports.LocalEnvManager = LocalEnvManager;
 //# sourceMappingURL=localEnvManager.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;~~AAWb~~,kEAA4C;AAC5C,qDAA+B;AAC/B,mDAA6B;AAE7B,~~6EAAuD;AACvD,oEAAiE;AACjE,~~iDAAyE;AACzE,+~~CAAmE~~;~~AACnE~~,~~oCAAgF;AAChF,8CAAgD;AAChD,4CAA6D;AAC7D,6DAAuD;AACvD,mEAAgE;AAChE,uEAAsF;AACtF,6DAA0D;AAC1D,8DAA2D;AAE3D,uFAGqD;AACrD,qDAAgE;AAChE,4DAAyE;AACzE,oFAA+F;AAC/F,+CAAuD;AAEvD,~~MAAa,eAAe;IAK1B,YAAY,MAAoB,EAAE,SAA6B,EAAE,EAAoB;QACnF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,eAAgC;QACjE,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,6CAAqB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC7D,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC/E,MAAM,iBAAiB,GAAG,6CAAqB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnF,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACrE,MAAM,oBAAoB~~,GAAG,6CAAqB,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC~~;QAEzF,SAAS;QACT,IAAI,MAAM,EAAE;YACV,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC;aAAM;YACL,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,SAAS,CAAC,CAAC;SACpC;QAED,SAAS;QACT,IAAI,CAAC,eAAe,IAAI,iBAAiB,CAAC,IAAI,cAAc,EAAE;YAC5D,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,MAAM,CAAC,CAAC;SACjC;QAED,qBAAqB;QACrB,IAAI,cAAc,IAAI,oBAAoB,EAAE;YAC1C,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,aAAa,CAAC,CAAC;SACxC;QAED,QAAQ;QACR,IAAI,UAAU,EAAE;YACd,SAAS,CAAC,IAAI,CAAC,sBAAQ,CAAC,KAAK,CAAC,CAAC;SAChC;QAED,OAAO,yBAAW,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,WAAmB,EACnB,eAAgC,EAChC,aAA+B,EAC/B,OAAsB;QAEtB,OAAO,MAAM,gBAAgB,CAAC,kBAAkB,CAC9C,WAAW,EACX,eAAe,EACf,OAAO,EACP,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,mCAAoB,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,~~mBAAmB,CAC9B,WAAmB,EACnB,eAAgC;QAEhC,OAAO,MAAM,iCAAmB,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,~~aAAa,CAAC,KAAe;QACxC,OAAO,MAAM,2BAAa,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,~~qBAAqB,CAChC,aAAqB;QAErB,OAAO,MAAM,6BAAqB,CAAC,aAAa,CAAC,CAAC;IACpD,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,eAAe,CAC1B,WAAmB~~,EACnB,YAAmC~~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~~AAnLD~~,~~0CAmLC~~"}
1	+ {"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,kEAA4C;AAC5C,qDAA+B;AAC/B,mDAA6B;AAE7B,iDAAyE;AACzE,+CAA8C;AAE9C,MAAa,eAAe;IAK1B,YAAY,MAAoB,EAAE,SAA6B,EAAE,EAAoB;QACnF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,oBAAoB;QAC/B,OAAO,MAAM,mCAAoB,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,KAAe;QACxC,OAAO,MAAM,2BAAa,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,WAAmB;QAC1C,IAAI;YACF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YACxE,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACnC;QAAC,WAAM;YACN,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AA5BD,0CA4BC"}

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

	@@ -1 +1 @@
1	- {"version":3,"file":"localTelemetryReporter.d.ts","sourceRoot":"","sources":["../../../src/common/local/localTelemetryReporter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,~~EAA0B~~,MAAM,wBAAwB,CAAC;~~AAIjF~~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"}
1	+ {"version":3,"file":"localTelemetryReporter.d.ts","sourceRoot":"","sources":["../../../src/common/local/localTelemetryReporter.ts"],"names":[],"mappings":"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"}

package/build/common/local/localTelemetryReporter.js CHANGED Viewed

@@ -6,6 +6,7 @@ exports.LocalTelemetryReporter = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const perf_hooks_1 = require("perf_hooks");
 const telemetry_1 = require("../telemetry");
+const common_1 = require("../../error/common");
 // Telemetry utility for local debug/preview in vsc/cli
 class LocalTelemetryReporter {
     constructor(reporter, saveEventTime) {
@@ -71,7 +72,7 @@ class LocalTelemetryReporter {
         const errorProps = [...ctx.errorProps];
         if (result.isErr()) {
             // exception
-            const error = teamsfx_api_1.assembleError(result.error, LocalTelemetryReporter.ComponentName);
+            const error = common_1.assembleError(result.error, LocalTelemetryReporter.ComponentName);
             properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.No;
             this.sendTelemetryErrorEvent(eventName, error, properties, measurements, errorProps);
             // Propagate exception because wrapper function should not change original behavior.

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

	@@ -1 +1 @@
1	- {"version":3,"file":"localTelemetryReporter.js","sourceRoot":"","sources":["../../../src/common/local/localTelemetryReporter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,~~wDAAiF~~;~~AACjF~~,2CAAyC;AACzC,4CAAmE;~~AAyBnE~~,uDAAuD;AACvD,MAAa,sBAAsB;IAWjC,YACE,QAA+B,EAC/B,aAAyD;QAEzD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,gBAAgB,CAC3B,SAAiB,EACjB,MAA8D;QAE9D,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,yBAAyB,CACpC,SAAiB,EACjB,MAA6C;QAE7C,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,mCAAmC,CAC9C,SAAiB,EACjB,iBAA4C,EAC5C,MAA6C;QAE7C,OAAO,MAAM,IAAI,CAAC,uBAAuB,CACvC,SAAS,EACT,MAAM,EACN,GAAG,EAAE,CAAC,SAAS,EACf,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,0BAA0B,CACrC,SAAiB,EACjB,iBAA4C,EAC5C,MAA8D;QAE9D,OAAO,MAAM,IAAI,CAAC,uBAAuB,CACvC,SAAS,EACT,MAAM,EACN,CAAC,KAAyB,EAAuB,EAAE;YACjD,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACjD,CAAC,EACD,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,uBAAuB,CAClC,SAAiB,EACjB,MAA6C,EAC7C,qBAAgF,EAChF,iBAA6C;QAE7C,MAAM,WAAW,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAEhG,MAAM,GAAG,GAAqB;YAC5B,UAAU,EAAE,iBAAiB,IAAI,EAAE;YACnC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,qEAAqE;QACrE,IAAI,MAAiD,CAAC;QACtD,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC7D,MAAM,GAAG,gBAAE,CAAC,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC;SAC1C;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,GAAG,iBAAG,CAAC,KAAK,CAAC,CAAC;SACrB;QACD,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAChC;YACE,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,eAAe;SAC3D,EACD,GAAG,CAAC,YAAY,CACjB,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,YAAY;YACZ,MAAM,KAAK,GAAG,~~2BAAa~~,CAAC,MAAM,CAAC,KAAK,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC;YAChF,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,4BAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;YACrF,oFAAoF;YACpF,MAAM,MAAM,CAAC,KAAK,CAAC;SACpB;aAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;YACxC,UAAU;YACV,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,4BAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,uBAAuB,CAC1B,SAAS,EACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EACf,UAAU,EACV,YAAY,EACZ,UAAU,CACX,CAAC;YACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxB;aAAM;YACL,UAAU;YACV,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,4BAAgB,CAAC,GAAG,CAAC;YAC7D,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YAC7D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxB;IACH,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS;YACrC,CAAC,CAAC,sBAAsB,CAAC,eAAe;YACxC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IACzB,CAAC;IAEM,kBAAkB,CACvB,SAAiB,EACjB,UAAsC,EACtC,YAAwC;;QAExC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,MAAA,IAAI,CAAC,aAAa,+CAAlB,IAAI,EAAiB,SAAS,EAAE,wBAAW,CAAC,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IACxE,CAAC;IAEM,uBAAuB,CAC5B,SAAiB,EACjB,KAAc,EACd,UAAoC,EACpC,YAAsC,EACtC,UAAqB;;QAErB,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,sBAAsB,CAAC,0BAA0B,CAAC,MAAK,SAAS,EAAE;YACjF,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC5B,UAAU,GAAG,EAAE,CAAC;aACjB;YACD,UAAU,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACzF;QACD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,MAAA,IAAI,CAAC,aAAa,+CAAlB,IAAI,EAAiB,SAAS,EAAE,wBAAW,CAAC,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAChG,CAAC;;AA5KH,wDA6KC;AA5KwB,sCAAe,GAAG,eAAe,CAAC;AAClC,iDAA0B,GAAG,uBAAuB,CAAC;AACrD,uCAAgB,GAAG,UAAU,CAAC;AAE7B,oCAAa,GAAG,aAAa,CAAC;AAC9B,uCAAgB,GAAG,QAAQ,CAAC"}
1	+ {"version":3,"file":"localTelemetryReporter.js","sourceRoot":"","sources":["../../../src/common/local/localTelemetryReporter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAkE;AAClE,2CAAyC;AACzC,4CAAmE;AACnE,+CAAmD;AAyBnD,uDAAuD;AACvD,MAAa,sBAAsB;IAWjC,YACE,QAA+B,EAC/B,aAAyD;QAEzD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,gBAAgB,CAC3B,SAAiB,EACjB,MAA8D;QAE9D,OAAO,MAAM,IAAI,CAAC,0BAA0B,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,yBAAyB,CACpC,SAAiB,EACjB,MAA6C;QAE7C,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,mCAAmC,CAC9C,SAAiB,EACjB,iBAA4C,EAC5C,MAA6C;QAE7C,OAAO,MAAM,IAAI,CAAC,uBAAuB,CACvC,SAAS,EACT,MAAM,EACN,GAAG,EAAE,CAAC,SAAS,EACf,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,0BAA0B,CACrC,SAAiB,EACjB,iBAA4C,EAC5C,MAA8D;QAE9D,OAAO,MAAM,IAAI,CAAC,uBAAuB,CACvC,SAAS,EACT,MAAM,EACN,CAAC,KAAyB,EAAuB,EAAE;YACjD,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACjD,CAAC,EACD,iBAAiB,CAClB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,uBAAuB,CAClC,SAAiB,EACjB,MAA6C,EAC7C,qBAAgF,EAChF,iBAA6C;QAE7C,MAAM,WAAW,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,kBAAkB,CAAC,SAAS,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAEhG,MAAM,GAAG,GAAqB;YAC5B,UAAU,EAAE,iBAAiB,IAAI,EAAE;YACnC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,qEAAqE;QACrE,IAAI,MAAiD,CAAC;QACtD,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC7D,MAAM,GAAG,gBAAE,CAAC,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC;SAC1C;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,GAAG,iBAAG,CAAC,KAAK,CAAC,CAAC;SACrB;QACD,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;QACzD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAChC;YACE,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAE,eAAe;SAC3D,EACD,GAAG,CAAC,YAAY,CACjB,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;QAEvC,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,YAAY;YACZ,MAAM,KAAK,GAAG,sBAAa,CAAC,MAAM,CAAC,KAAK,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC;YAChF,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,4BAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;YACrF,oFAAoF;YACpF,MAAM,MAAM,CAAC,KAAK,CAAC;SACpB;aAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;YACxC,UAAU;YACV,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,4BAAgB,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,uBAAuB,CAC1B,SAAS,EACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EACf,UAAU,EACV,YAAY,EACZ,UAAU,CACX,CAAC;YACF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxB;aAAM;YACL,UAAU;YACV,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,GAAG,4BAAgB,CAAC,GAAG,CAAC;YAC7D,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YAC7D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxB;IACH,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,aAAa,KAAK,SAAS;YACrC,CAAC,CAAC,sBAAsB,CAAC,eAAe;YACxC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IACzB,CAAC;IAEM,kBAAkB,CACvB,SAAiB,EACjB,UAAsC,EACtC,YAAwC;;QAExC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,MAAA,IAAI,CAAC,aAAa,+CAAlB,IAAI,EAAiB,SAAS,EAAE,wBAAW,CAAC,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IACxE,CAAC;IAEM,uBAAuB,CAC5B,SAAiB,EACjB,KAAc,EACd,UAAoC,EACpC,YAAsC,EACtC,UAAqB;;QAErB,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,sBAAsB,CAAC,0BAA0B,CAAC,MAAK,SAAS,EAAE;YACjF,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC5B,UAAU,GAAG,EAAE,CAAC;aACjB;YACD,UAAU,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACzF;QACD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,MAAA,IAAI,CAAC,aAAa,+CAAlB,IAAI,EAAiB,SAAS,EAAE,wBAAW,CAAC,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAChG,CAAC;;AA5KH,wDA6KC;AA5KwB,sCAAe,GAAG,eAAe,CAAC;AAClC,iDAA0B,GAAG,uBAAuB,CAAC;AACrD,uCAAgB,GAAG,UAAU,CAAC;AAE7B,oCAAa,GAAG,aAAa,CAAC;AAC9B,uCAAgB,GAAG,QAAQ,CAAC"}

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

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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,~~EAAE,eAAe,~~EAAa,MAAM,wBAAwB,CAAC;~~AAmDjF~~,wBAAsB,~~mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAoCnB;AAED,wBAAsB,~~aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQ5F"}
1	+ {"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAa,MAAM,wBAAwB,CAAC;AAqChE,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQ5F"}

package/build/common/local/portChecker.js CHANGED Viewed

@@ -2,25 +2,12 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPortsInUse = exports.getPortsFromProject = void 0;
+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 frontendPorts = [53000];
-const simpleAuthPorts = [55000];
-const backendDebugPortRegex = /--inspect[\s]*=[\s"']*9229/im;
-const backendDebugPorts = [9229];
-const backendServicePortRegex = /--port[\s"']*7071/im;
-const backendServicePorts = [7071];
-const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
-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() });
@@ -43,39 +30,6 @@ async function detectPortListening(port, logger) {
         return false;
     }
 }
-async function getPortsFromProject(projectPath, projectSettings, ignoreDebugPort) {
-    const ports = [];
-    const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
-    if (includeFrontend) {
-        ports.push(...frontendPorts);
-        const includeSimpleAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeSimpleAuth(projectSettings);
-        if (includeSimpleAuth) {
-            ports.push(...simpleAuthPorts);
-        }
-    }
-    const includeBackend = projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettings);
-    if (includeBackend) {
-        ports.push(...backendServicePorts);
-        if (!(ignoreDebugPort === true)) {
-            const backendDevScript = await packageJsonHelper_1.loadTeamsFxDevScript(path.join(projectPath, constants_1.FolderName.Function));
-            if (backendDevScript === undefined || backendDebugPortRegex.test(backendDevScript)) {
-                ports.push(...backendDebugPorts);
-            }
-        }
-    }
-    const includeBot = projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettings);
-    if (includeBot) {
-        ports.push(...botServicePorts);
-        if (!(ignoreDebugPort === true)) {
-            const botDevScript = await packageJsonHelper_1.loadTeamsFxDevScript(path.join(projectPath, constants_1.FolderName.Bot));
-            if (botDevScript === undefined || botDebugPortRegex.test(botDevScript)) {
-                ports.push(...botDebugPorts);
-            }
-        }
-    }
-    return ports;
-}
-exports.getPortsFromProject = getPortsFromProject;
 async function getPortsInUse(ports, logger) {
     const portsInUse = [];
     for (const port of ports) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,~~wDAAiF~~;~~AACjF~~,~~mDAA6B;AAC7B,~~sEAAqC;AAErC,~~2CAAyC;AACzC,2DAA2D;AAC3D,mEAAgE;AAChE,~~4CAA8C;AAC9C,4CAKsB;AAEtB,~~MAAM,aAAa,GAAG,CAAC,~~KAAK,CAAC,CAAC;AAC9B,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,CAAC;AAChC,MAAM,qBAAqB,GAAG,8BAA8B,CAAC;AAC7D,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,CAAC;AACjC,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,mBAAmB,GAAG,CAAC,IAAI,CAAC,CAAC;AACnC,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AACzD,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,CAAC;AAC7B,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,CAAC;AAE/B,KAAK,UAAU,mBAAmB,CAAC,IAAY,EAAE,MAAoB;IACnE,IAAI;QACF,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACxB,qBAAU,CAAC,IAAI,CAAC;YAChB,qDAAqD;YACrD,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;SAC7E,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC;QAC9B,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,UAAU,EAAE;YAC5D,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,KAAK,IAAI,CAAC;KAC5B;IAAC,OAAO,KAAU,EAAE;QACnB,0CAA0C;QAC1C,mCAAuB,CACrB,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,UAAU,EACzB,IAAI,uBAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CACtE,CAAC;QACF,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,0BAA0B,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,GAAG,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAEM,KAAK,UAAU,~~mBAAmB,CACvC,WAAmB,EACnB,eAAgC,EAChC,eAAyB;IAEzB,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC/E,IAAI,eAAe,EAAE;QACnB,KAAK,CAAC,IAAI,CAAC,GAAG,~~aAAa,CAAC,CAAC;QAC7B,MAAM,iBAAiB,GAAG,6CAAqB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnF,IAAI,iBAAiB,EAAE;YACrB,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;SAChC;KACF;IAED,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAC7E,IAAI,cAAc,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE;YAC/B,MAAM,gBAAgB,GAAG,MAAM,wCAAoB,CACjD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,CAAC,CAC5C,CAAC;YACF,IAAI,gBAAgB,KAAK,SAAS,IAAI,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBAClF,KAAK,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;aAClC;SACF;KACF;IACD,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACrE,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE;YAC/B,MAAM,YAAY,GAAG,MAAM,wCAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACxF,IAAI,YAAY,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACtE,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;aAC9B;SACF;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAxCD,kDAwCC;AAEM,KAAK,UAAU,aAAa,CAAC,KAAe,EAAE,MAAoB;IACvE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,MAAM,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YAC3C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACvB;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AARD,sCAQC"}
1	+ {"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,wDAAgE;AAChE,sEAAqC;AAErC,4CAA8C;AAC9C,4CAKsB;AAEtB,KAAK,UAAU,mBAAmB,CAAC,IAAY,EAAE,MAAoB;IACnE,IAAI;QACF,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACxB,qBAAU,CAAC,IAAI,CAAC;YAChB,qDAAqD;YACrD,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;SAC7E,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC;QAC9B,8BAAkB,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,UAAU,EAAE;YAC5D,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,KAAK,IAAI,CAAC;KAC5B;IAAC,OAAO,KAAU,EAAE;QACnB,0CAA0C;QAC1C,mCAAuB,CACrB,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,UAAU,EACzB,IAAI,uBAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CACtE,CAAC;QACF,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,0BAA0B,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,GAAG,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,KAAe,EAAE,MAAoB;IACvE,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,MAAM,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YAC3C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACvB;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AARD,sCAQC"}

package/build/common/m365/launchHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"launchHelper.d.ts","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":"AAGA,OAAO,~~EAGL~~,OAAO,~~EACP~~,WAAW,~~EACX~~,iBAAiB,~~EAEjB~~,MAAM,~~EACP~~,MAAM,wBAAwB,CAAC;~~AAIhC~~,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;~~AAKlC~~,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;gBAEnB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAKhE,YAAY,CACvB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,UAAO,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IA2CtB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;~~YA2BjE~~,eAAe;YAUf,eAAe;CAS9B"}
1	+ {"version":3,"file":"launchHelper.d.ts","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIlG,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAMlC,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;gBAEnB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAKhE,YAAY,CACvB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,UAAO,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IA2CtB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAwBjE,eAAe;YAUf,eAAe;CAS9B"}

package/build/common/m365/launchHelper.js CHANGED Viewed

@@ -10,6 +10,7 @@ const constants_1 = require("./constants");
 const errors_1 = require("./errors");
 const packageService_1 = require("./packageService");
 const serviceConstant_1 = require("./serviceConstant");
+const common_1 = require("../../error/common");
 class LaunchHelper {
     constructor(m365TokenProvider, logger) {
         this.m365TokenProvider = m365TokenProvider;
@@ -59,7 +60,7 @@ class LaunchHelper {
         return teamsfx_api_1.ok(url.toString());
     }
     async getM365AppId(teamsAppId) {
-        var _a, _b, _c;
+        var _a, _b;
         const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.serviceEndpoint;
         const sideloadingServiceScope = (_b = process.env.SIDELOADING_SERVICE_SCOPE) !== null && _b !== void 0 ? _b : serviceConstant_1.serviceScope;
         const packageService = new packageService_1.PackageService(sideloadingServiceEndpoint, this.logger);
@@ -78,10 +79,7 @@ class LaunchHelper {
             return teamsfx_api_1.ok(m365AppId);
         }
         catch (error) {
-            if (((_c = error.innerError) === null || _c === void 0 ? void 0 : _c.response.status) === 404) {
-                return teamsfx_api_1.err(new errors_1.NotExtendedToM365Error(error_1.CoreSource));
-            }
-            return teamsfx_api_1.err(teamsfx_api_1.assembleError(error));
+            return teamsfx_api_1.err(common_1.assembleError(error));
         }
     }
     async getTidFromToken() {

package/build/common/m365/launchHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"launchHelper.js","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,~~wDAQgC~~;~~AAEhC~~,4CAA8C;AAC9C,oCAA2C;AAC3C,2CAAkC;AAClC,qCAAkD;AAClD,qDAAkD;AAClD,uDAAkE;~~AAElE~~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~~IAAI,CAAA,MAAC,KAAiB,CAAC,UAAU,0CAAE,QAAQ,CAAC,MAAM,MAAK,GAAG,EAAE;gBAC1D,~~OAAO,iBAAG,CAAC,~~IAAI,+BAAsB~~,CAAC,~~kBAAU,CAAC,CAAC,CAAC;aACpD;YACD,OAAO,iBAAG,CAAC,2BAAa,CAAC,~~KAAK,CAAC,CAAC,CAAC;SAClC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,uBAAe,EAAE,CAAC,CAAC;YACtF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAa,CAAC;SACnC;QAAC,WAAM;YACN,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,uBAAe,EAAE,CAAC,CAAC;YACtF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAa,CAAC;SACnC;QAAC,WAAM;YACN,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;~~AAvGD~~,~~oCAuGC~~"}
1	+ {"version":3,"file":"launchHelper.js","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAkG;AAElG,4CAA8C;AAC9C,oCAA2C;AAC3C,2CAAkC;AAClC,qCAAkD;AAClD,qDAAkD;AAClD,uDAAkE;AAClE,+CAAmD;AAEnD,MAAa,YAAY;IAIvB,YAAmB,iBAAoC,EAAE,MAAoB;QAC3E,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,GAAQ,EACR,UAAkB,EAClB,YAAsB,EACtB,aAAa,GAAG,IAAI;;QAEpB,MAAM,SAAS,GAAG,aAAa;YAC7B,CAAC,CAAC,MAAA,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,mCAAI,yBAAyB,CAAC,iDAAiD;YAC/G,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,GAAQ,CAAC;QACb,QAAQ,GAAG,EAAE;YACX,KAAK,eAAG,CAAC,KAAK,CAAC,CAAC;gBACd,MAAM,OAAO,GAAG,qCAAqC,UAAU,sCAAsC,CAAC;gBACtG,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzC,IAAI,GAAG,EAAE;oBACP,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;iBAC7C;gBACD,MAAM;aACP;YACD,KAAK,eAAG,CAAC,OAAO,CAAC,CAAC;gBAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBACnD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;oBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBAC1B;gBACD,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC;oBAChD,CAAC,CAAC,mCAAmC,MAAM,CAAC,KAAK,EAAE;oBACnD,CAAC,CAAC,iCAAiC,CAAC;gBACtC,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvB,MAAM;aACP;YACD,KAAK,eAAG,CAAC,MAAM;gBACb;oBACE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;oBACnD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;wBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;qBAC1B;oBACD,MAAM,OAAO,GAAG,mCAAmC,MAAM,CAAC,KAAK,SAAS,CAAC;oBACzE,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;iBACxB;gBACD,MAAM;SACT;QACD,IAAI,SAAS,EAAE;YACb,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;SAClD;QACD,OAAO,gBAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,UAAkB;;QAC1C,MAAM,0BAA0B,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,4BAA4B,mCAAI,iCAAe,CAAC;QAC/F,MAAM,uBAAuB,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,mCAAI,8BAAY,CAAC;QACtF,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,0BAA0B,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnF,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACtE,MAAM,EAAE,CAAC,uBAAuB,CAAC;SAClC,CAAC,CAAC;QACH,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;YAC/B,OAAO,iBAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;SACvC;QACD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC;QAEnD,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;YACnF,IAAI,CAAC,SAAS,EAAE;gBACd,OAAO,iBAAG,CAAC,IAAI,+BAAsB,CAAC,kBAAU,CAAC,CAAC,CAAC;aACpD;YACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,iBAAG,CAAC,sBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;SAClC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,uBAAe,EAAE,CAAC,CAAC;YACtF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAa,CAAC;SACnC;QAAC,WAAM;YACN,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,uBAAe,EAAE,CAAC,CAAC;YACtF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,OAAO,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAa,CAAC;SACnC;QAAC,WAAM;YACN,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AApGD,oCAoGC"}

package/build/common/m365/packageService.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"AAOA,OAAO,~~EAAiB~~,WAAW,EAAE,MAAM,wBAAwB,CAAC;~~AAMpE~~,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;gBAE9B,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;YAQ3C,kBAAkB;IAgBnB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAsE3E,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;~~IAmD1E~~,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASnE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAO7E,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBxD,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCrF,OAAO,CAAC,UAAU;CAWnB"}
1	+ {"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQrD,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;gBAE9B,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;YAQ3C,kBAAkB;IAgBnB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAsE3E,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAqD1E,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASnE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAO7E,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBxD,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiCrF,OAAO,CAAC,UAAU;CAWnB"}

package/build/common/m365/packageService.js CHANGED Viewed

@@ -7,9 +7,10 @@ const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const tools_1 = require("../tools");
 const error_1 = require("../../core/error");
+const errors_1 = require("./errors");
+const common_1 = require("../../error/common");
 // Call m365 service for package CRUD
 class PackageService {
     constructor(endpoint, logger) {
@@ -91,7 +92,7 @@ class PackageService {
             else {
                 (_k = this.logger) === null || _k === void 0 ? void 0 : _k.error(error.message);
             }
-            throw teamsfx_api_1.assembleError(error, error_1.CoreSource);
+            throw common_1.assembleError(error, error_1.CoreSource);
         }
     }
     async getLaunchInfoByManifestId(token, manifestId) {
@@ -134,11 +135,14 @@ class PackageService {
             if (error.response) {
                 (_d = this.logger) === null || _d === void 0 ? void 0 : _d.error(JSON.stringify(error.response.data));
                 this.traceError(error);
+                if (error.response.status === 404) {
+                    throw new errors_1.NotExtendedToM365Error(error_1.CoreSource);
+                }
             }
             else {
                 (_e = this.logger) === null || _e === void 0 ? void 0 : _e.error(error.message);
             }
-            throw teamsfx_api_1.assembleError(error, error_1.CoreSource);
+            throw common_1.assembleError(error, error_1.CoreSource);
         }
     }
     async retrieveTitleId(token, manifestId) {
@@ -177,7 +181,7 @@ class PackageService {
             else {
                 (_e = this.logger) === null || _e === void 0 ? void 0 : _e.error(error.message);
             }
-            throw teamsfx_api_1.assembleError(error, error_1.CoreSource);
+            throw common_1.assembleError(error, error_1.CoreSource);
         }
     }
     async getLaunchInfoByTitleId(token, titleId) {
@@ -208,7 +212,7 @@ class PackageService {
             else {
                 (_e = this.logger) === null || _e === void 0 ? void 0 : _e.error(error.message);
             }
-            throw teamsfx_api_1.assembleError(error, error_1.CoreSource);
+            throw common_1.assembleError(error, error_1.CoreSource);
         }
     }
     traceError(error) {

package/build/common/m365/packageService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,0DAA0B;AAC1B,kEAAiC;AACjC,gEAA0B;~~AAE1B~~,~~wDAAoE;AAEpE,~~oCAAuC;AACvC,4CAA8C;~~AAE9C~~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~~2BAAa~~,CAAC,KAAK,EAAE,kBAAU,CAAC,CAAC;SACxC;IACH,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,KAAa,EAAE,UAAkB;;QACtE,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACxD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,sCAAsC,UAAU,MAAM,CAAC,CAAC;YAC1E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAC9C,qCAAqC,EACrC;gBACE,EAAE,EAAE,UAAU;gBACd,MAAM,EAAE,YAAY;gBACpB,MAAM,EAAE;oBACN,qBAAqB,EAAE;wBACrB,2EAA2E;wBAC3E,cAAc;wBACd,gBAAgB;wBAChB,iBAAiB;wBACjB,UAAU;wBACV,KAAK;wBACL,gBAAgB;wBAChB,YAAY;wBACZ,mBAAmB;wBACnB,MAAM;wBACN,gBAAgB;wBAChB,kBAAkB;wBAClB,YAAY;wBACZ,4BAA4B;qBAC7B;iBACF;aACF,EACD;gBACE,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,KAAK,EAAE;iBACjC;aACF,CACF,CAAC;YAEF,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,OAAO,UAAU,CAAC,IAAI,CAAC;SACxB;QAAC,OAAO,KAAU,EAAE;YACnB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC7C,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;~~aACxB~~;iBAAM;gBACL,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACnC;~~YAED~~,MAAM,~~2BAAa~~,CAAC,KAAK,EAAE,kBAAU,CAAC,CAAC;SACxC;IACH,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,KAAa,EAAE,UAAkB;;QAC5D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,OAAO,GACX,MAAC,MAAA,MAAA,UAAU,CAAC,WAAW,0CAAE,OAAO,0CAAE,EAAa,mCAC9C,MAAA,UAAU,CAAC,WAAW,0CAAE,OAAkB,CAAC;QAC9C,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;QAC1C,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,UAAkB;;QAC1D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAA,UAAU,CAAC,WAAW,0CAAE,KAAK,CAAC;QAC5C,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,OAAe;;QACnD,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACxD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,oCAAoC,OAAO,MAAM,CAAC,CAAC;YACrE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,kCAAkC,OAAO,EAAE,EAAE;gBAC3E,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,KAAK,EAAE;iBACjC;aACF,CAAC,CAAC;YACH,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACxC;QAAC,OAAO,KAAU,EAAE;YACnB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACxC,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACxB;iBAAM;gBACL,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACnC;YAED,MAAM,~~2BAAa~~,CAAC,KAAK,EAAE,kBAAU,CAAC,CAAC;SACxC;IACH,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,OAAe;;QAChE,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACxD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,mCAAmC,OAAO,MAAM,CAAC,CAAC;YACpE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAC7C,4BAA4B,OAAO,aAAa,EAChD;gBACE,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE;oBACN,qBAAqB;oBACnB,iDAAiD;oBACjD,4LAA4L;iBAC/L;gBACD,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,KAAK,EAAE;iBACjC;aACF,CACF,CAAC;YACF,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACnD,OAAO,UAAU,CAAC,IAAI,CAAC;SACxB;QAAC,OAAO,KAAU,EAAE;YACnB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC7C,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACxB;iBAAM;gBACL,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACnC;YAED,MAAM,~~2BAAa~~,CAAC,KAAK,EAAE,kBAAU,CAAC,CAAC;SACxC;IACH,CAAC;IAEO,UAAU,CAAC,KAAU;;QAC3B,yCAAyC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,0CAAE,aAAa,mCAAI,EAAE,CAAC;QAC9D,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC;QACtC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;IACL,CAAC;CACF;~~AA1OD~~,~~wCA0OC~~"}
1	+ {"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"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"}

package/build/common/projectSettingsHelper.d.ts CHANGED Viewed

@@ -3,12 +3,6 @@ export declare function validateProjectSettings(projectSettings: ProjectSettings
 export declare function isValidProject(workspacePath?: string): boolean;
 export declare function isValidProjectV3(workspacePath: string): boolean;
 export declare function isValidProjectV2(workspacePath: string): boolean;
-export declare function hasAAD(projectSetting: ProjectSettings): boolean;
-export declare function hasSPFx(projectSetting: ProjectSettings): boolean;
-export declare function hasAzureResource(projectSetting: ProjectSettings, excludeAad?: boolean): boolean;
-export declare function getAzurePlugins(excludeAad?: boolean): string[];
-export declare function isExistingTabApp(projectSettings: ProjectSettings): boolean;
-export declare function getProjectSettingsVersion(): string;
-export declare function newProjectSettings(): ProjectSettings;
 export declare function isVSProject(projectSettings?: ProjectSettings): boolean;
+export declare function isExistingTabApp(projectSettings: ProjectSettings): boolean;
 //# sourceMappingURL=projectSettingsHelper.d.ts.map

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

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

package/build/common/projectSettingsHelper.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVSProject = exports.newProjectSettings = exports.getProjectSettingsVersion = exports.isExistingTabApp = exports.getAzurePlugins = exports.hasAzureResource = exports.hasSPFx = exports.hasAAD = exports.isValidProjectV2 = exports.isValidProjectV3 = exports.isValidProject = exports.validateProjectSettings = void 0;
+exports.isExistingTabApp = exports.isVSProject = exports.isValidProjectV2 = exports.isValidProjectV3 = exports.isValidProject = exports.validateProjectSettings = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -8,8 +8,6 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const constants_1 = require("../component/constants");
-const uuid = tslib_1.__importStar(require("uuid"));
-const tools_1 = require("./tools");
 const versionMetadata_1 = require("./versionMetadata");
 function validateProjectSettings(projectSettings) {
     var _a;
@@ -64,12 +62,7 @@ function isValidProject(workspacePath) {
     if (!workspacePath)
         return false;
     try {
-        if (tools_1.isV3Enabled()) {
-            return isValidProjectV3(workspacePath) || isValidProjectV2(workspacePath);
-        }
-        else {
-            return isValidProjectV2(workspacePath);
-        }
+        return isValidProjectV3(workspacePath) || isValidProjectV2(workspacePath);
     }
     catch (e) {
         return false;
@@ -77,18 +70,6 @@ function isValidProject(workspacePath) {
 }
 exports.isValidProject = isValidProject;
 function isValidProjectV3(workspacePath) {
-    // TODO: should be cleaned after v3 folder changed.
-    const filePath = path.resolve(workspacePath, teamsfx_api_1.SettingsFolderName, teamsfx_api_1.SettingsFileName);
-    if (fs_extra_1.default.existsSync(filePath)) {
-        const projectSettings = fs_extra_1.default.readJsonSync(filePath);
-        if (!projectSettings.trackingId) {
-            return false;
-        }
-        if (!projectSettings.version) {
-            return false;
-        }
-        return true;
-    }
     const ymlFilePath = path.join(workspacePath, versionMetadata_1.MetadataV3.configFile);
     const localYmlPath = path.join(workspacePath, versionMetadata_1.MetadataV3.localConfigFile);
     if (fs_extra_1.default.pathExistsSync(ymlFilePath) || fs_extra_1.default.pathExistsSync(localYmlPath)) {
@@ -109,81 +90,12 @@ function isValidProjectV2(workspacePath) {
     return true;
 }
 exports.isValidProjectV2 = isValidProjectV2;
-function hasAAD(projectSetting) {
-    const solutionSettings = projectSetting.solutionSettings;
-    if (!solutionSettings)
-        return false;
-    return solutionSettings.activeResourcePlugins.includes(constants_1.BuiltInFeaturePluginNames.aad);
-}
-exports.hasAAD = hasAAD;
-function hasSPFx(projectSetting) {
-    const solutionSettings = projectSetting.solutionSettings;
-    if (!solutionSettings)
-        return false;
-    return solutionSettings.activeResourcePlugins.includes(constants_1.BuiltInFeaturePluginNames.spfx);
-}
-exports.hasSPFx = hasSPFx;
-function hasAzureResource(projectSetting, excludeAad = false) {
-    const solutionSettings = projectSetting.solutionSettings;
-    if (!solutionSettings)
-        return false;
-    const azurePlugins = getAzurePlugins(excludeAad);
-    for (const pluginName of solutionSettings.activeResourcePlugins) {
-        if (azurePlugins.includes(pluginName))
-            return true;
-    }
-    return false;
-}
-exports.hasAzureResource = hasAzureResource;
-function getAzurePlugins(excludeAad = false) {
-    const azurePlugins = [
-        constants_1.BuiltInFeaturePluginNames.apim,
-        constants_1.BuiltInFeaturePluginNames.bot,
-        constants_1.BuiltInFeaturePluginNames.frontend,
-        constants_1.BuiltInFeaturePluginNames.function,
-        constants_1.BuiltInFeaturePluginNames.identity,
-        constants_1.BuiltInFeaturePluginNames.keyVault,
-        constants_1.BuiltInFeaturePluginNames.simpleAuth,
-        constants_1.BuiltInFeaturePluginNames.sql,
-    ];
-    if (!excludeAad) {
-        azurePlugins.push(constants_1.BuiltInFeaturePluginNames.aad);
-    }
-    return azurePlugins;
+function isVSProject(projectSettings) {
+    return (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.programmingLanguage) === "csharp";
 }
-exports.getAzurePlugins = getAzurePlugins;
+exports.isVSProject = isVSProject;
 function isExistingTabApp(projectSettings) {
-    var _a;
-    if (!tools_1.isExistingTabAppEnabled()) {
-        return false;
-    }
-    const solutionSettings = projectSettings.solutionSettings;
-    if (!solutionSettings) {
-        return true;
-    }
-    // Scenario: SSO is added to existing tab app
-    if (((_a = solutionSettings.capabilities) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
-        solutionSettings.capabilities.includes(constants_1.TabSsoItem().id)) {
-        return true;
-    }
     return false;
 }
 exports.isExistingTabApp = isExistingTabApp;
-function getProjectSettingsVersion() {
-    return "2.1.0";
-}
-exports.getProjectSettingsVersion = getProjectSettingsVersion;
-function newProjectSettings() {
-    const projectSettings = {
-        appName: "",
-        projectId: uuid.v4(),
-        version: getProjectSettingsVersion(),
-    };
-    return projectSettings;
-}
-exports.newProjectSettings = newProjectSettings;
-function isVSProject(projectSettings) {
-    return (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.programmingLanguage) === "csharp";
-}
-exports.isVSProject = isVSProject;
 //# sourceMappingURL=projectSettingsHelper.js.map