@microsoft/teamsfx-core 1.2.2-alpha.e84c0d19.0 → 1.3.0-rc.1
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.
- package/build/common/deps-checker/constant/message.d.ts +0 -1
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +0 -4
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/local/constants.d.ts +5 -0
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +7 -1
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/index.d.ts +1 -0
- package/build/common/local/index.d.ts.map +1 -1
- package/build/common/local/index.js +1 -0
- package/build/common/local/index.js.map +1 -1
- package/build/{plugins/solution/fx-solution/debug/util/certificate.d.ts → common/local/localCertificateManager.d.ts} +4 -6
- package/build/common/local/localCertificateManager.d.ts.map +1 -0
- package/build/{plugins/solution/fx-solution/debug/util/certificate.js → common/local/localCertificateManager.js} +37 -47
- package/build/common/local/localCertificateManager.js.map +1 -0
- package/build/common/local/localEnvManager.d.ts +4 -2
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +8 -1
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts +1 -0
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +29 -1
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/local/portChecker.d.ts.map +1 -1
- package/build/common/local/portChecker.js +18 -48
- package/build/common/local/portChecker.js.map +1 -1
- package/build/{plugins/solution/fx-solution/debug/util → common/local}/process.d.ts +0 -0
- package/build/common/local/process.d.ts.map +1 -0
- package/build/{plugins/solution/fx-solution/debug/util → common/local}/process.js +0 -0
- package/build/common/local/process.js.map +1 -0
- package/build/common/local/taskDefinition.js +1 -1
- package/build/common/local/taskDefinition.js.map +1 -1
- package/build/common/permissionInterface.d.ts +1 -0
- package/build/common/permissionInterface.d.ts.map +1 -1
- package/build/common/permissionInterface.js +1 -0
- package/build/common/permissionInterface.js.map +1 -1
- package/build/common/projectSettingsValidator.d.ts +4 -0
- package/build/common/projectSettingsValidator.d.ts.map +1 -0
- package/build/common/projectSettingsValidator.js +65 -0
- package/build/common/projectSettingsValidator.js.map +1 -0
- package/build/common/samples-config.json +24 -12
- package/build/common/samples.d.ts +1 -0
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +1 -0
- package/build/common/samples.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/core/error.js +1 -1
- package/build/core/error.js.map +1 -1
- package/build/core/index.js +1 -1
- package/build/core/middleware/CommonErrorHandlerMW.d.ts +14 -0
- package/build/core/middleware/CommonErrorHandlerMW.d.ts.map +1 -0
- package/build/core/middleware/CommonErrorHandlerMW.js +55 -0
- package/build/core/middleware/CommonErrorHandlerMW.js.map +1 -0
- package/build/core/middleware/errorHandler.js +2 -1
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigrator.js +1 -2
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +1 -1
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +2 -6
- package/build/core/tools.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +2 -2
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js +2 -1
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/apim/managers/apimManager.d.ts.map +1 -1
- package/build/plugins/resource/apim/managers/apimManager.js +2 -4
- package/build/plugins/resource/apim/managers/apimManager.js.map +1 -1
- package/build/plugins/resource/apim/managers/questionManager.d.ts +1 -1
- package/build/plugins/resource/apim/managers/questionManager.d.ts.map +1 -1
- package/build/plugins/resource/apim/managers/questionManager.js +11 -9
- package/build/plugins/resource/apim/managers/questionManager.js.map +1 -1
- package/build/plugins/resource/apim/v2/index.d.ts +2 -2
- package/build/plugins/resource/apim/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/v2/index.js +2 -1
- package/build/plugins/resource/apim/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +2 -0
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +71 -1
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +2 -2
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.d.ts +2 -2
- package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.js +2 -1
- package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +16 -2
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.d.ts.map +1 -1
- package/build/plugins/resource/bot/aadRegistration.js +5 -4
- package/build/plugins/resource/bot/aadRegistration.js.map +1 -1
- package/build/plugins/resource/bot/dotnet/constants.d.ts +5 -0
- package/build/plugins/resource/bot/dotnet/constants.d.ts.map +1 -0
- package/build/plugins/resource/bot/dotnet/constants.js +13 -0
- package/build/plugins/resource/bot/dotnet/constants.js.map +1 -0
- package/build/plugins/resource/bot/dotnet/plugin.d.ts +14 -0
- package/build/plugins/resource/bot/dotnet/plugin.d.ts.map +1 -0
- package/build/plugins/resource/bot/dotnet/plugin.js +62 -0
- package/build/plugins/resource/bot/dotnet/plugin.js.map +1 -0
- package/build/plugins/resource/bot/index.d.ts +5 -0
- package/build/plugins/resource/bot/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/index.js +23 -13
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/bot/interface.d.ts +16 -0
- package/build/plugins/resource/bot/interface.d.ts.map +1 -0
- package/build/plugins/resource/bot/interface.js +5 -0
- package/build/plugins/resource/bot/interface.js.map +1 -0
- package/build/plugins/resource/bot/plugin.d.ts +2 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +2 -4
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +2 -2
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +2 -1
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/constants.d.ts +12 -3
- package/build/plugins/resource/frontend/dotnet/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/constants.js +12 -3
- package/build/plugins/resource/frontend/dotnet/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +14 -8
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/interface.d.ts.map +1 -1
- package/build/plugins/resource/frontend/interface.js +2 -0
- package/build/plugins/resource/frontend/interface.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +2 -3
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts +2 -2
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js +2 -1
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.js +7 -7
- package/build/plugins/resource/frontend/v3/AzureStoragePlugin.js.map +1 -1
- package/build/plugins/resource/function/plugin.d.ts.map +1 -1
- package/build/plugins/resource/function/plugin.js +2 -4
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/v2/index.d.ts +2 -2
- package/build/plugins/resource/function/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v2/index.js +2 -1
- package/build/plugins/resource/function/v2/index.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +1 -2
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/identity/v2/index.d.ts +2 -2
- package/build/plugins/resource/identity/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/v2/index.js +2 -1
- package/build/plugins/resource/identity/v2/index.js.map +1 -1
- package/build/plugins/resource/keyvault/plugin.d.ts.map +1 -1
- package/build/plugins/resource/keyvault/plugin.js +1 -2
- package/build/plugins/resource/keyvault/plugin.js.map +1 -1
- package/build/plugins/resource/keyvault/v2/index.d.ts +2 -2
- package/build/plugins/resource/keyvault/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/keyvault/v2/index.js +2 -1
- package/build/plugins/resource/keyvault/v2/index.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts +2 -2
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +2 -1
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/index.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/index.js +5 -5
- package/build/plugins/resource/simpleauth/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +2 -4
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/simpleauth/v2/index.d.ts +2 -2
- package/build/plugins/resource/simpleauth/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/v2/index.js +2 -1
- package/build/plugins/resource/simpleauth/v2/index.js.map +1 -1
- package/build/plugins/resource/spfx/v2/index.d.ts +2 -2
- package/build/plugins/resource/spfx/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/spfx/v2/index.js +2 -1
- package/build/plugins/resource/spfx/v2/index.js.map +1 -1
- package/build/plugins/resource/sql/config.d.ts +1 -0
- package/build/plugins/resource/sql/config.d.ts.map +1 -1
- package/build/plugins/resource/sql/config.js +1 -0
- package/build/plugins/resource/sql/config.js.map +1 -1
- package/build/plugins/resource/sql/constants.d.ts +3 -0
- package/build/plugins/resource/sql/constants.d.ts.map +1 -1
- package/build/plugins/resource/sql/constants.js +3 -0
- package/build/plugins/resource/sql/constants.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts +1 -1
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +1 -1
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/index.js +10 -2
- package/build/plugins/resource/sql/index.js.map +1 -1
- package/build/plugins/resource/sql/managementClient.js +14 -14
- package/build/plugins/resource/sql/managementClient.js.map +1 -1
- package/build/plugins/resource/sql/plugin.d.ts +3 -0
- package/build/plugins/resource/sql/plugin.d.ts.map +1 -1
- package/build/plugins/resource/sql/plugin.js +53 -13
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts +2 -2
- package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/sqlClient.js +13 -12
- package/build/plugins/resource/sql/sqlClient.js.map +1 -1
- package/build/plugins/resource/sql/v2/index.d.ts +2 -2
- package/build/plugins/resource/sql/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/v2/index.js +2 -1
- package/build/plugins/resource/sql/v2/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts +3 -3
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +3 -3
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +6 -9
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.d.ts +0 -5
- package/build/plugins/solution/fx-solution/debug/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.js +1 -7
- package/build/plugins/solution/fx-solution/debug/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +18 -4
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/checkPermission.js +1 -2
- package/build/plugins/solution/fx-solution/v2/checkPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +2 -2
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +2 -4
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +3 -3
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/grantPermission.js +1 -2
- package/build/plugins/solution/fx-solution/v2/grantPermission.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js +6 -1
- package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +10 -2
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +3 -3
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +6 -4
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +11 -5
- package/resource/strings.json +6 -1
- package/templates/plugins/resource/botservice/bicep/botServiceProvision.template.bicep +34 -0
- package/templates/plugins/resource/botservice/bicep/parameters.json +4 -0
- package/templates/plugins/resource/botservice/bicep/provision.template.bicep +13 -0
- package/templates/plugins/resource/sql/bicep/newDatabase.orchestration.template.bicep +5 -0
- package/templates/plugins/resource/sql/bicep/newDatabaseProvision.template.bicep +15 -0
- package/templates/plugins/resource/sql/bicep/sqlProvision.template.bicep +1 -0
- package/templates/plugins/resource/storage/bicep/azureStorageProvision.bicep +25 -0
- package/templates/plugins/resource/storage/bicep/provision.template.bicep +15 -0
- package/templates/plugins/resource/webapp/bicep/provision.template.bicep +1 -0
- package/templates/plugins/resource/webapp/bicep/webappConfiguration.template.bicep +2 -2
- package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep +1 -0
- package/build/plugins/solution/fx-solution/debug/util/certificate.d.ts.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/certificate.js.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/process.d.ts.map +0 -1
- package/build/plugins/solution/fx-solution/debug/util/process.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDpB,CAAC"}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.Messages = void 0;
|
|
6
6
|
exports.Messages = {
|
|
7
7
|
learnMoreButtonText: "Learn more",
|
|
8
|
-
continueButtonText: "Continue anyway",
|
|
9
8
|
defaultErrorMessage: "Install the required dependencies manually.",
|
|
10
9
|
startInstallFunctionCoreTool: `Downloading and installing @NameVersion.`,
|
|
11
10
|
finishInstallFunctionCoreTool: `Successfully installed @NameVersion.`,
|
|
@@ -34,7 +33,6 @@ Click "Learn more" to learn how to install the Node.js.
|
|
|
34
33
|
NodeNotSupported: `Node.js (@CurrentVersion) is not in the supported version list (@SupportedVersions).
|
|
35
34
|
|
|
36
35
|
Click "Learn more" to learn more about the supported Node.js versions.
|
|
37
|
-
Click "Continue anyway" to continue local debugging.
|
|
38
36
|
|
|
39
37
|
(If you just installed Node.js (@SupportedVersions), restart Visual Studio Code for the change to take effect.)`,
|
|
40
38
|
dotnetNotFound: `Cannot find @NameVersion. For the details why .NET SDK is needed, refer to @HelpLink`,
|
|
@@ -47,8 +45,6 @@ Click "Install" to install @InstallPackages.`,
|
|
|
47
45
|
|
|
48
46
|
Teams Toolkit requires these dependencies.
|
|
49
47
|
|
|
50
|
-
Click "Continue anyway" to continue.
|
|
51
|
-
|
|
52
48
|
(If you just installed @SupportedPackages, restart Visual Studio Code for the change to take effect.)`,
|
|
53
49
|
linuxDepsNotFoundHelpLinkMessage: `Cannot find @SupportedPackages.
|
|
54
50
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,QAAQ,GAAG;IACtB,mBAAmB,EAAE,YAAY;IACjC,
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,QAAQ,GAAG;IACtB,mBAAmB,EAAE,YAAY;IACjC,mBAAmB,EAAE,6CAA6C;IAElE,4BAA4B,EAAE,0CAA0C;IACxE,6BAA6B,EAAE,sCAAsC;IACrE,6BAA6B,EAAE,gEAAgE;IAC/F,uBAAuB,EAAE,qEAAqE;IAC9F,yBAAyB,EAAE,gEAAgE;IAC3F,0BAA0B,EAAE,qDAAqD;IAEjF,iBAAiB,EAAE,0CAA0C;IAC7D,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,+DAA+D;IACjF,kBAAkB,EAAE,gEAAgE;IACpF,mBAAmB,EAAE,qDAAqD;IAE1E,cAAc,EAAE,+IAA+I;IAC/J,mBAAmB,EAAE,sCAAsC;IAC3D,eAAe,EAAE,yBAAyB;IAC1C,mBAAmB,EAAE,0FAA0F;IAC/G,sBAAsB,EAAE,gCAAgC;IACxD,mBAAmB,EAAE,+FAA+F;IAEpH,YAAY,EAAE;;;;;;2FAM2E;IACzF,gBAAgB,EAAE;;;;gHAI4F;IAE9G,cAAc,EAAE,sFAAsF;IACtG,YAAY,EAAE;;;;6CAI6B;IAE3C,iBAAiB,EAAE;;;;sGAIiF;IAEpG,gCAAgC,EAAE;;2CAEO;CAC1C,CAAC"}
|
|
@@ -112,4 +112,9 @@ export declare const LocalSettingsBotKeys: Readonly<{
|
|
|
112
112
|
BotDomain: string;
|
|
113
113
|
BotEndpoint: string;
|
|
114
114
|
}>;
|
|
115
|
+
export declare class LocalDebugCertificate {
|
|
116
|
+
static readonly CertFileName: string;
|
|
117
|
+
static readonly KeyFileName: string;
|
|
118
|
+
static readonly FriendlyName: string;
|
|
119
|
+
}
|
|
115
120
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;EAGxC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = exports.LocalEnvBotKeysMigratedFromV1 = exports.LocalEnvFrontendKeys = exports.LocalEnvCertKeys = exports.LocalEnvBotKeys = exports.LocalEnvBackendKeys = exports.LocalEnvAuthKeys = exports.npmInstallCommand = exports.ProgrammingLanguage = exports.FolderName = void 0;
|
|
5
|
+
exports.LocalDebugCertificate = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = exports.LocalEnvBotKeysMigratedFromV1 = exports.LocalEnvFrontendKeys = exports.LocalEnvCertKeys = exports.LocalEnvBotKeys = exports.LocalEnvBackendKeys = exports.LocalEnvAuthKeys = exports.npmInstallCommand = exports.ProgrammingLanguage = exports.FolderName = void 0;
|
|
6
6
|
class FolderName {
|
|
7
7
|
}
|
|
8
8
|
exports.FolderName = FolderName;
|
|
@@ -119,4 +119,10 @@ exports.LocalSettingsBotKeys = Object.freeze({
|
|
|
119
119
|
BotDomain: "botDomain",
|
|
120
120
|
BotEndpoint: "botEndpoint",
|
|
121
121
|
});
|
|
122
|
+
class LocalDebugCertificate {
|
|
123
|
+
}
|
|
124
|
+
exports.LocalDebugCertificate = LocalDebugCertificate;
|
|
125
|
+
LocalDebugCertificate.CertFileName = "localhost.crt";
|
|
126
|
+
LocalDebugCertificate.KeyFileName = "localhost.key";
|
|
127
|
+
LocalDebugCertificate.FriendlyName = "TeamsFx Development Certificate";
|
|
122
128
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
tslib_1.__exportStar(require("./localEnvManager"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./packageJsonHelper"), exports);
|
|
7
8
|
tslib_1.__exportStar(require("./projectSettingsHelper"), exports);
|
|
8
9
|
tslib_1.__exportStar(require("./taskDefinition"), exports);
|
|
9
10
|
tslib_1.__exportStar(require("./constants"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,4DAAkC;AAClC,kEAAwC;AACxC,2DAAiC;AACjC,sDAA4B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,4DAAkC;AAClC,8DAAoC;AACpC,kEAAwC;AACxC,2DAAiC;AACjC,sDAA4B"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LogProvider, UserInteraction } from "@microsoft/teamsfx-api";
|
|
2
2
|
export interface LocalCertificate {
|
|
3
3
|
certPath: string;
|
|
4
4
|
keyPath: string;
|
|
5
|
-
isTrusted
|
|
5
|
+
isTrusted?: boolean;
|
|
6
6
|
}
|
|
7
7
|
export declare class LocalCertificateManager {
|
|
8
8
|
private readonly ui?;
|
|
9
|
-
private readonly platform?;
|
|
10
9
|
private readonly logger?;
|
|
11
10
|
private readonly certFolder;
|
|
12
|
-
constructor(
|
|
11
|
+
constructor(ui?: UserInteraction, logger?: LogProvider);
|
|
13
12
|
/**
|
|
14
13
|
* Local certificates are located at {home}/.fx/certificate/
|
|
15
14
|
* Public certificate should be trusted into user"s certificate store.
|
|
@@ -23,7 +22,6 @@ export declare class LocalCertificateManager {
|
|
|
23
22
|
private verifyCertificateContent;
|
|
24
23
|
private verifyCertificateInStore;
|
|
25
24
|
private trustCertificate;
|
|
26
|
-
private showWarningMessage;
|
|
27
25
|
private waitForUserConfirm;
|
|
28
26
|
}
|
|
29
|
-
//# sourceMappingURL=
|
|
27
|
+
//# sourceMappingURL=localCertificateManager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAoB,WAAW,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAoBxF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,EAAE,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW;IAMtD;;;;;;;OAOG;IACU,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAgD9D,mBAAmB;IAgEjC,OAAO,CAAC,wBAAwB;YAsFlB,wBAAwB;YAgCxB,gBAAgB;YAuChB,kBAAkB;CAsBjC"}
|
|
@@ -9,7 +9,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
9
9
|
const node_forge_1 = require("node-forge");
|
|
10
10
|
const os = tslib_1.__importStar(require("os"));
|
|
11
11
|
const uuid_1 = require("uuid");
|
|
12
|
-
const constants_1 = require("
|
|
12
|
+
const constants_1 = require("./constants");
|
|
13
13
|
const ps = tslib_1.__importStar(require("./process"));
|
|
14
14
|
const installText = "Install";
|
|
15
15
|
const learnMoreText = "Learn More";
|
|
@@ -21,10 +21,9 @@ const warningMessage = 'To debug applications in Teams, your localhost server mu
|
|
|
21
21
|
const confirmMessage = warningMessage +
|
|
22
22
|
" You may be asked for your account credentials when installing the certificate.";
|
|
23
23
|
class LocalCertificateManager {
|
|
24
|
-
constructor(
|
|
25
|
-
this.ui =
|
|
26
|
-
this.logger =
|
|
27
|
-
this.platform = inputs.platform;
|
|
24
|
+
constructor(ui, logger) {
|
|
25
|
+
this.ui = ui;
|
|
26
|
+
this.logger = logger;
|
|
28
27
|
this.certFolder = `${os.homedir()}/.${teamsfx_api_1.ConfigFolderName}/certificate`;
|
|
29
28
|
}
|
|
30
29
|
/**
|
|
@@ -36,39 +35,46 @@ class LocalCertificateManager {
|
|
|
36
35
|
* - Add to cert store if not trusted (friendly name as well)
|
|
37
36
|
*/
|
|
38
37
|
async setupCertificate(needTrust) {
|
|
39
|
-
var _a;
|
|
38
|
+
var _a, _b;
|
|
40
39
|
const certFilePath = `${this.certFolder}/${constants_1.LocalDebugCertificate.CertFileName}`;
|
|
41
40
|
const keyFilePath = `${this.certFolder}/${constants_1.LocalDebugCertificate.KeyFileName}`;
|
|
42
41
|
const localCert = {
|
|
43
42
|
certPath: certFilePath,
|
|
44
43
|
keyPath: keyFilePath,
|
|
45
|
-
isTrusted: false,
|
|
46
44
|
};
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
45
|
+
try {
|
|
46
|
+
let certThumbprint = undefined;
|
|
47
|
+
await fs.ensureDir(this.certFolder);
|
|
48
|
+
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.info("Detecting/Verifying local certificate.");
|
|
49
|
+
if ((await fs.pathExists(certFilePath)) && (await fs.pathExists(keyFilePath))) {
|
|
50
|
+
const certContent = await fs.readFile(certFilePath, { encoding: "utf8" });
|
|
51
|
+
const keyContent = await fs.readFile(keyFilePath, { encoding: "utf8" });
|
|
52
|
+
const verifyRes = this.verifyCertificateContent(certContent, keyContent);
|
|
53
|
+
if (verifyRes[1]) {
|
|
54
|
+
certThumbprint = verifyRes[0];
|
|
55
|
+
}
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
certThumbprint = await this.generateCertificate(certFilePath, keyFilePath);
|
|
61
|
-
}
|
|
62
|
-
if (needTrust) {
|
|
63
|
-
if (certThumbprint && (await this.verifyCertificateInStore(certThumbprint))) {
|
|
64
|
-
// already trusted
|
|
65
|
-
localCert.isTrusted = true;
|
|
57
|
+
if (!certThumbprint) {
|
|
58
|
+
// generate cert and key
|
|
59
|
+
certThumbprint = await this.generateCertificate(certFilePath, keyFilePath);
|
|
66
60
|
}
|
|
67
|
-
|
|
68
|
-
|
|
61
|
+
if (needTrust) {
|
|
62
|
+
if (certThumbprint && (await this.verifyCertificateInStore(certThumbprint))) {
|
|
63
|
+
// already trusted
|
|
64
|
+
localCert.isTrusted = true;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
localCert.isTrusted = await this.trustCertificate(localCert.certPath, certThumbprint, constants_1.LocalDebugCertificate.FriendlyName);
|
|
68
|
+
}
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
|
|
71
|
+
catch (error) {
|
|
72
|
+
(_b = this.logger) === null || _b === void 0 ? void 0 : _b.warning(`Failed to setup certificate. Error: ${error}`);
|
|
73
|
+
localCert.isTrusted = false;
|
|
74
|
+
}
|
|
75
|
+
finally {
|
|
76
|
+
return localCert;
|
|
77
|
+
}
|
|
72
78
|
}
|
|
73
79
|
async generateCertificate(certFile, keyFile) {
|
|
74
80
|
var _a;
|
|
@@ -213,7 +219,7 @@ class LocalCertificateManager {
|
|
|
213
219
|
}
|
|
214
220
|
else {
|
|
215
221
|
// TODO: Linux
|
|
216
|
-
return
|
|
222
|
+
return undefined;
|
|
217
223
|
}
|
|
218
224
|
}
|
|
219
225
|
catch (error) {
|
|
@@ -244,7 +250,7 @@ class LocalCertificateManager {
|
|
|
244
250
|
}
|
|
245
251
|
else {
|
|
246
252
|
// TODO: Linux
|
|
247
|
-
return
|
|
253
|
+
return undefined;
|
|
248
254
|
}
|
|
249
255
|
}
|
|
250
256
|
catch (error) {
|
|
@@ -253,22 +259,6 @@ class LocalCertificateManager {
|
|
|
253
259
|
return false;
|
|
254
260
|
}
|
|
255
261
|
}
|
|
256
|
-
showWarningMessage() {
|
|
257
|
-
if (this.ui) {
|
|
258
|
-
if (this.platform === teamsfx_api_1.Platform.CLI) {
|
|
259
|
-
// no user interaction for CLI
|
|
260
|
-
this.ui.showMessage("warn", warningMessage, false);
|
|
261
|
-
}
|
|
262
|
-
else {
|
|
263
|
-
this.ui.showMessage("warn", warningMessage, false, learnMoreText).then((result) => {
|
|
264
|
-
const userSelected = result.isOk() ? result.value : undefined;
|
|
265
|
-
if (userSelected === learnMoreText) {
|
|
266
|
-
this.ui.openUrl(learnMoreUrl);
|
|
267
|
-
}
|
|
268
|
-
});
|
|
269
|
-
}
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
262
|
async waitForUserConfirm() {
|
|
273
263
|
if (this.ui) {
|
|
274
264
|
let userSelected;
|
|
@@ -286,4 +276,4 @@ class LocalCertificateManager {
|
|
|
286
276
|
}
|
|
287
277
|
}
|
|
288
278
|
exports.LocalCertificateManager = LocalCertificateManager;
|
|
289
|
-
//# sourceMappingURL=
|
|
279
|
+
//# sourceMappingURL=localCertificateManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localCertificateManager.js","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,qDAA+B;AAC/B,wDAAwF;AACxF,2CAA2C;AAC3C,+CAAyB;AACzB,+BAAoC;AAEpC,2CAAoD;AACpD,sDAAgC;AAEhC,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,aAAa,GAAG,YAAY,CAAC;AACnC,MAAM,YAAY,GAAG,uCAAuC,CAAC;AAC7D,MAAM,cAAc,GAClB;;;+DAG6D,CAAC;AAChE,MAAM,cAAc,GAClB,cAAc;IACd,iFAAiF,CAAC;AAQpF,MAAa,uBAAuB;IAKlC,YAAY,EAAoB,EAAE,MAAoB;QACpD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,8BAAgB,cAAc,CAAC;IACvE,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,gBAAgB,CAAC,SAAkB;;QAC9C,MAAM,YAAY,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,iCAAqB,CAAC,YAAY,EAAE,CAAC;QAChF,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,iCAAqB,CAAC,WAAW,EAAE,CAAC;QAC9E,MAAM,SAAS,GAAqB;YAClC,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,WAAW;SACrB,CAAC;QAEF,IAAI;YACF,IAAI,cAAc,GAAuB,SAAS,CAAC;YACnD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpC,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,wCAAwC,CAAC,CAAC;YAE5D,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE;gBAC7E,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC1E,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBACxE,MAAM,SAAS,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;gBACzE,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;oBAChB,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC/B;aACF;YAED,IAAI,CAAC,cAAc,EAAE;gBACnB,wBAAwB;gBACxB,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;aAC5E;YAED,IAAI,SAAS,EAAE;gBACb,IAAI,cAAc,IAAI,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,EAAE;oBAC3E,kBAAkB;oBAClB,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;iBAC5B;qBAAM;oBACL,SAAS,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAC/C,SAAS,CAAC,QAAQ,EAClB,cAAc,EACd,iCAAqB,CAAC,YAAY,CACnC,CAAC;iBACH;aACF;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;YACrE,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC;SAC7B;gBAAS;YACR,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,OAAe;;QACjE,oCAAoC;QACpC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,SAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG;YACZ;gBACE,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,WAAW;aACnB;SACF,CAAC;QACF,MAAM,IAAI,GAAG;YACX;gBACE,IAAI,EAAE,kBAAkB;gBACxB,EAAE,EAAE,KAAK;aACV;YACD;gBACE,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,IAAI;aACjB;YACD;gBACE,IAAI,EAAE,gBAAgB;gBACtB,QAAQ,EAAE;oBACR;wBACE,IAAI,EAAE,CAAC;wBACP,KAAK,EAAE,WAAW;qBACnB;iBACF;aACF;SACF,CAAC;QAEF,wBAAwB;QACxB,MAAM,IAAI,GAAG,gBAAG,CAAC,GAAG,CAAC,eAAe,CAAC;YACnC,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,gBAAG,CAAC,iBAAiB,EAAE,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/C,iBAAiB;QACjB,MAAM,GAAG,GAAG,iBAAI,CAAC,KAAK,CAAC,gBAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC/D,MAAM,CAAC,GAAG,eAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QAEtC,SAAS;QACT,MAAM,WAAW,GAAG,gBAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,gBAAG,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE9D,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;QAChE,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,wBAAwB,CAC9B,WAAmB,EACnB,UAAkB;QAElB,MAAM,UAAU,GAAuB,SAAS,CAAC;QACjD,IAAI;YACF,MAAM,IAAI,GAAG,gBAAG,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,gBAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAErD,iBAAiB;YACjB,MAAM,GAAG,GAAG,iBAAI,CAAC,KAAK,CAAC,gBAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC/D,MAAM,CAAC,GAAG,eAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC3B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YAEtC,kBAAkB;YAClB,MAAM,iBAAiB,GAAG,gBAAG,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;YAC3E,IAAI,gBAAG,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,gBAAG,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;gBAChF,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,4BAA4B;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,WAAW,KAAK,OAAO,CAAC,KAAK,EAAE;gBACjC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,WAAW,KAAK,MAAM,CAAC,KAAK,EAAE;gBAChC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,kCAAkC;YAClC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;YAC5B,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxC,IAAI,SAAS,GAAG,GAAG,IAAI,QAAQ,GAAG,QAAQ,EAAE;gBAC1C,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,mBAAmB;YACnB,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAE5D,CAAC;YACF,IACE,gBAAgB,KAAK,SAAS;gBAC9B,gBAAgB,CAAC,EAAE,KAAK,SAAS;gBACjC,gBAAgB,CAAC,EAAE,EACnB;gBACA,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAElD,CAAC;YACF,IACE,WAAW,KAAK,SAAS;gBACzB,WAAW,CAAC,UAAU,KAAK,SAAS;gBACpC,CAAC,WAAW,CAAC,UAAU,EACvB;gBACA,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAKxD,CAAC;YACF,IACE,cAAc,KAAK,SAAS;gBAC5B,cAAc,CAAC,QAAQ,KAAK,SAAS;gBACrC,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,CAAC,EAC7E;gBACA,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC5B;YAED,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;SAC3B;QAAC,OAAO,KAAK,EAAE;YACd,kEAAkE;YAClE,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;SAC5B;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,UAAkB;;QACvD,IAAI;YACF,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,YAAY,EAAE;gBAC9B,MAAM,cAAc,GAAG,wFAAwF,UAAU,iBAAiB,CAAC;gBAC3I,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC5E,OAAO,kBAAkB,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,CAAC;aACtE;iBAAM,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,QAAQ,EAAE;gBACjC,MAAM,eAAe,GAAG,oDAAoD,EAAE,CAAC,OAAO,EAAE,uCAAuC,CAAC;gBAChI,MAAM,oBAAoB,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBACjE,IAAI,oBAAoB,EAAE;oBACxB,MAAM,eAAe,GAAG,0BAA0B,CAAC;oBACnD,IAAI,KAAK,GAAG,SAAS,CAAC;oBACtB,OAAO,CAAC,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE;wBAC3D,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;wBACpC,IAAI,kBAAkB,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,EAAE;4BACjE,OAAO,IAAI,CAAC;yBACb;qBACF;iBACF;gBAED,OAAO,KAAK,CAAC;aACd;iBAAM;gBACL,cAAc;gBACd,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,kEAAkE;YAClE,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;YAChE,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,QAAgB,EAChB,UAAkB,EAClB,YAAoB;;QAEpB,IAAI;YACF,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,YAAY,EAAE;gBAC9B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE;oBACtC,OAAO,KAAK,CAAC;iBACd;gBAED,MAAM,kBAAkB,GAAG,kCAAkC,QAAQ,8DAA8D,CAAC;gBACpI,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAExE,MAAM,mBAAmB,GAAG,kDAAkD,UAAU,mBAAmB,YAAY,GAAG,CAAC;gBAC3H,MAAM,EAAE,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;gBAE7C,OAAO,IAAI,CAAC;aACb;iBAAM,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,QAAQ,EAAE;gBACjC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE;oBACtC,OAAO,KAAK,CAAC;iBACd;gBAED,MAAM,EAAE,CAAC,SAAS,CAChB,wCAAwC,EAAE,CAAC,OAAO,EAAE,0CAA0C,QAAQ,GAAG,CAC1G,CAAC;gBAEF,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,cAAc;gBACd,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,qEAAqE;YACrE,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;YACvE,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,IAAI,YAAgC,CAAC;YACrC,GAAG;gBACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CACnC,MAAM,EACN,cAAc,EACd,IAAI,EACJ,aAAa,EACb,WAAW,CACZ,CAAC;gBACF,YAAY,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;gBAClD,IAAI,YAAY,KAAK,aAAa,EAAE;oBAClC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;iBAC/B;aACF,QAAQ,YAAY,KAAK,aAAa,EAAE;YACzC,OAAO,YAAY,KAAK,WAAW,CAAC;SACrC;QAED,iCAAiC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAtTD,0DAsTC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { Json, LogProvider, ProjectSettings, TelemetryReporter } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { Json, LogProvider, ProjectSettings, TelemetryReporter, UserInteraction } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { NpmInstallLogInfo } from "./npmLogHelper";
|
|
3
3
|
import { DepsType } from "../deps-checker/depsChecker";
|
|
4
4
|
export declare class LocalEnvManager {
|
|
5
5
|
private readonly logger;
|
|
6
6
|
private readonly telemetry;
|
|
7
|
-
|
|
7
|
+
private readonly ui;
|
|
8
|
+
constructor(logger?: LogProvider, telemetry?: TelemetryReporter, ui?: UserInteraction);
|
|
8
9
|
getActiveDependencies(projectSettings: ProjectSettings): DepsType[];
|
|
9
10
|
getLocalDebugEnvs(projectPath: string, projectSettings: ProjectSettings, localSettings: Json | undefined): Promise<Record<string, string>>;
|
|
10
11
|
getNpmInstallLogInfo(): Promise<NpmInstallLogInfo | undefined>;
|
|
@@ -13,6 +14,7 @@ export declare class LocalEnvManager {
|
|
|
13
14
|
projectId: string;
|
|
14
15
|
}): Promise<Json | undefined>;
|
|
15
16
|
getProjectSettings(projectPath: string): Promise<ProjectSettings>;
|
|
17
|
+
resolveLocalCertificate(trustDevCert: boolean): Promise<boolean | undefined>;
|
|
16
18
|
private retry;
|
|
17
19
|
}
|
|
18
20
|
//# sourceMappingURL=localEnvManager.d.ts.map
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -16,10 +16,12 @@ const crypto_1 = require("../../core/crypto");
|
|
|
16
16
|
const error_1 = require("../../core/error");
|
|
17
17
|
const depsChecker_1 = require("../deps-checker/depsChecker");
|
|
18
18
|
const projectSettingsHelper_1 = require("./projectSettingsHelper");
|
|
19
|
+
const localCertificateManager_1 = require("./localCertificateManager");
|
|
19
20
|
class LocalEnvManager {
|
|
20
|
-
constructor(logger, telemetry) {
|
|
21
|
+
constructor(logger, telemetry, ui) {
|
|
21
22
|
this.logger = logger;
|
|
22
23
|
this.telemetry = telemetry;
|
|
24
|
+
this.ui = ui;
|
|
23
25
|
}
|
|
24
26
|
getActiveDependencies(projectSettings) {
|
|
25
27
|
const depsTypes = [];
|
|
@@ -82,6 +84,11 @@ class LocalEnvManager {
|
|
|
82
84
|
}
|
|
83
85
|
});
|
|
84
86
|
}
|
|
87
|
+
async resolveLocalCertificate(trustDevCert) {
|
|
88
|
+
const certManager = new localCertificateManager_1.LocalCertificateManager(this.ui, this.logger);
|
|
89
|
+
const localCert = await certManager.setupCertificate(trustDevCert);
|
|
90
|
+
return localCert.isTrusted;
|
|
91
|
+
}
|
|
85
92
|
// Retry logic when reading project config files in case of read-write conflict
|
|
86
93
|
async retry(func) {
|
|
87
94
|
let n = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,
|
|
1
|
+
{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { LogProvider } from "@microsoft/teamsfx-api";
|
|
2
2
|
export declare function loadPackageJson(path: string, logger?: LogProvider): Promise<any>;
|
|
3
3
|
export declare function loadTeamsFxDevScript(componentRoot: string): Promise<string | undefined>;
|
|
4
|
+
export declare function checkNpmDependencies(folder: string): Promise<boolean>;
|
|
4
5
|
//# sourceMappingURL=packageJsonHelper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageJsonHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"packageJsonHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAOrD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAatF;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7F;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B3E"}
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.loadTeamsFxDevScript = exports.loadPackageJson = void 0;
|
|
5
|
+
exports.checkNpmDependencies = exports.loadTeamsFxDevScript = exports.loadPackageJson = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
8
8
|
const path = tslib_1.__importStar(require("path"));
|
|
9
|
+
const Arborist = require("@npmcli/arborist");
|
|
9
10
|
const npmRunDevRegex = /npm[\s]+run[\s]+dev/im;
|
|
10
11
|
async function loadPackageJson(path, logger) {
|
|
11
12
|
if (!(await fs.pathExists(path))) {
|
|
@@ -33,4 +34,31 @@ async function loadTeamsFxDevScript(componentRoot) {
|
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
exports.loadTeamsFxDevScript = loadTeamsFxDevScript;
|
|
37
|
+
async function checkNpmDependencies(folder) {
|
|
38
|
+
var _a;
|
|
39
|
+
if (await fs.pathExists(folder)) {
|
|
40
|
+
const packageJson = await loadPackageJson(path.join(folder, "package.json"));
|
|
41
|
+
if (((packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) && Object.keys(packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies).length > 0) ||
|
|
42
|
+
((packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) && Object.keys(packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies).length > 0)) {
|
|
43
|
+
// load deps from node_modules
|
|
44
|
+
const arb = new Arborist({ path: folder });
|
|
45
|
+
try {
|
|
46
|
+
await arb.loadActual();
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
// check if any missing dependency
|
|
52
|
+
const dependencies = ((_a = arb.actualTree) === null || _a === void 0 ? void 0 : _a.edgesOut) === undefined ? [] : [...arb.actualTree.edgesOut.values()];
|
|
53
|
+
return !dependencies.some((dependency) => dependency.error === "MISSING");
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
// treat no deps as npm installed
|
|
57
|
+
return true;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
// treat missing folder as npm installed
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
exports.checkNpmDependencies = checkNpmDependencies;
|
|
36
64
|
//# sourceMappingURL=packageJsonHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageJsonHelper.js","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,qDAA+B;AAC/B,mDAA6B;AAE7B,MAAM,cAAc,GAAG,uBAAuB,CAAC;AAExC,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,MAAoB;IACtE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;QAChC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iCAAiC,IAAI,mBAAmB,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9C,IAAI;QACF,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;KACxB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iCAAiC,IAAI,YAAY,KAAK,EAAE,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAbD,0CAaC;AAEM,KAAK,UAAU,oBAAoB,CAAC,aAAqB;IAC9D,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACpF,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC5E,MAAM,UAAU,GAAW,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9D,OAAO,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;KAClF;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AARD,oDAQC"}
|
|
1
|
+
{"version":3,"file":"packageJsonHelper.js","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -4,60 +4,30 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.getPortsInUse = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
|
-
const net = tslib_1.__importStar(require("net"));
|
|
8
7
|
const path = tslib_1.__importStar(require("path"));
|
|
8
|
+
const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
|
|
9
9
|
const constants_1 = require("./constants");
|
|
10
10
|
const packageJsonHelper_1 = require("./packageJsonHelper");
|
|
11
11
|
const projectSettingsHelper_1 = require("./projectSettingsHelper");
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const loopbackAddressIPv6 = "::1";
|
|
16
|
-
const hosts = [allAddressIPv4, loopbackAddressIPv4, allAddressIPv6, loopbackAddressIPv6];
|
|
17
|
-
const frontendPortsV1 = [[3000, hosts]];
|
|
18
|
-
const frontendPorts = [[53000, hosts]];
|
|
19
|
-
const simpleAuthPorts = [[55000, hosts]];
|
|
12
|
+
const frontendPortsV1 = [3000];
|
|
13
|
+
const frontendPorts = [53000];
|
|
14
|
+
const simpleAuthPorts = [55000];
|
|
20
15
|
const backendDebugPortRegex = /--inspect[\s]*=[\s"']*9229/im;
|
|
21
|
-
const backendDebugPorts = [
|
|
16
|
+
const backendDebugPorts = [9229];
|
|
22
17
|
const backendServicePortRegex = /--port[\s"']*7071/im;
|
|
23
|
-
const backendServicePorts = [
|
|
18
|
+
const backendServicePorts = [7071];
|
|
24
19
|
const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
|
|
25
|
-
const botDebugPorts = [
|
|
26
|
-
const botServicePorts = [
|
|
27
|
-
async function
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
20
|
+
const botDebugPorts = [9239];
|
|
21
|
+
const botServicePorts = [3978];
|
|
22
|
+
async function detectPortListening(port) {
|
|
23
|
+
try {
|
|
24
|
+
const portChosen = await detect_port_1.default(port);
|
|
25
|
+
return portChosen !== port;
|
|
26
|
+
}
|
|
27
|
+
catch (_a) {
|
|
28
|
+
// ignore any error to not block debugging
|
|
29
|
+
return false;
|
|
32
30
|
}
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
async function detectPortListening(port, host) {
|
|
36
|
-
return new Promise((resolve, _reject) => {
|
|
37
|
-
try {
|
|
38
|
-
const server = net.createServer();
|
|
39
|
-
server
|
|
40
|
-
.once("error", (err) => {
|
|
41
|
-
if (err.message.includes("EADDRINUSE")) {
|
|
42
|
-
resolve(true);
|
|
43
|
-
}
|
|
44
|
-
else {
|
|
45
|
-
resolve(false);
|
|
46
|
-
}
|
|
47
|
-
})
|
|
48
|
-
.once("listening", () => {
|
|
49
|
-
server.close();
|
|
50
|
-
})
|
|
51
|
-
.once("close", () => {
|
|
52
|
-
resolve(false);
|
|
53
|
-
})
|
|
54
|
-
.listen(port, host);
|
|
55
|
-
}
|
|
56
|
-
catch (err) {
|
|
57
|
-
// ignore any error to not block debugging
|
|
58
|
-
resolve(false);
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
31
|
}
|
|
62
32
|
async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
|
|
63
33
|
const ports = [];
|
|
@@ -94,8 +64,8 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
|
|
|
94
64
|
}
|
|
95
65
|
const portsInUse = [];
|
|
96
66
|
for (const port of ports) {
|
|
97
|
-
if (await
|
|
98
|
-
portsInUse.push(port
|
|
67
|
+
if (await detectPortListening(port)) {
|
|
68
|
+
portsInUse.push(port);
|
|
99
69
|
}
|
|
100
70
|
}
|
|
101
71
|
return portsInUse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,
|
|
1
|
+
{"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../src/common/local/process.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmB/D;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB1D"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../src/common/local/process.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,0DAAoC;AAEpC;;;GAGG;AACH,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI;YACF,MAAM,SAAS,GAAG,qEAAqE,OAAO,GAAG,CAAC;YAClG,EAAE,CAAC,IAAI,CACL,SAAS,EACT,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EACrF,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC,CACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,wCAmBC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,OAAe;IACvC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAI;YACF,EAAE,CAAC,IAAI,CACL,OAAO,EACP,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EACrF,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACxB,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,CAAC;iBACjB;YACH,CAAC,CACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAlBD,8BAkBC"}
|
|
@@ -131,7 +131,7 @@ class TaskDefinition {
|
|
|
131
131
|
name: "ngrok start",
|
|
132
132
|
command: skipNgrok
|
|
133
133
|
? "echo 'Skip starting ngrok, and will use predefined bot endpoint.'"
|
|
134
|
-
: "
|
|
134
|
+
: "ngrok http 3978 --log=stdout",
|
|
135
135
|
env: ngrokBinFolders
|
|
136
136
|
? {
|
|
137
137
|
PATH: `${ngrokBinFolders.join(path_1.default.delimiter)}${path_1.default.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`,
|