@microsoft/teamsfx-core 1.22.0 → 1.22.1-alpha.034f24ebd.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.
- package/build/common/azure-hosting/hostingConstant.d.ts +9 -9
- package/build/common/azure-hosting/hostingConstant.d.ts.map +1 -1
- package/build/common/azure-hosting/hostingConstant.js +9 -9
- package/build/common/azure-hosting/hostingConstant.js.map +1 -1
- package/build/common/azure-hosting/hostingError.js +7 -7
- package/build/common/azure-hosting/hostingError.js.map +1 -1
- package/build/common/azure-hosting/utils.js +2 -2
- package/build/common/azure-hosting/utils.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +27 -31
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +33 -31
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +12 -10
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +11 -9
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/ngrokChecker.js +5 -5
- package/build/common/deps-checker/internal/ngrokChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +7 -3
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +4 -4
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +11 -11
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +21 -16
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config-v3.json +24 -0
- package/build/common/samples-config.json +2 -32
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +21 -60
- package/build/common/tools.js.map +1 -1
- package/build/component/code/api/depsChecker/funcHelper.js +2 -2
- package/build/component/code/api/depsChecker/funcHelper.js.map +1 -1
- package/build/component/code/tab/tabCode.js +4 -4
- package/build/component/code/tab/tabCode.js.map +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +10 -10
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/constants.d.ts +25 -25
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +281 -213
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -0
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +78 -40
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/core.d.ts.map +1 -1
- package/build/component/core.js +11 -11
- package/build/component/core.js.map +1 -1
- package/build/component/deployUtils.d.ts +2 -0
- package/build/component/deployUtils.d.ts.map +1 -1
- package/build/component/deployUtils.js +11 -0
- package/build/component/deployUtils.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +4 -0
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +40 -6
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +15 -1
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +21 -9
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureDeployDriver.js +3 -0
- package/build/component/driver/deploy/azure/azureDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +17 -7
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/baseDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/baseDeployDriver.js +3 -1
- package/build/component/driver/deploy/azure/baseDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +9 -9
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/constants.d.ts +5 -5
- package/build/component/driver/deploy/spfx/utility/constants.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/utility/constants.js +5 -5
- package/build/component/driver/deploy/spfx/utility/constants.js.map +1 -1
- package/build/component/driver/interface/baseDeployStepDriver.d.ts +1 -0
- package/build/component/driver/interface/baseDeployStepDriver.d.ts.map +1 -1
- package/build/component/driver/interface/baseDeployStepDriver.js +1 -0
- package/build/component/driver/interface/baseDeployStepDriver.js.map +1 -1
- package/build/component/driver/interface/buildAndDeployArgs.d.ts +1 -0
- package/build/component/driver/interface/buildAndDeployArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +6 -0
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +21 -5
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +1 -0
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +16 -0
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +27 -5
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/CreateAppPackageArgs.d.ts +1 -1
- package/build/component/driver/teamsApp/interfaces/CreateAppPackageArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ValidateTeamsAppArgs.d.ts +1 -1
- package/build/component/driver/teamsApp/interfaces/ValidateTeamsAppArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -0
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +16 -0
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +1 -0
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +17 -1
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/feature/apiconnector/ApiConnectorImpl.js +22 -22
- package/build/component/feature/apiconnector/ApiConnectorImpl.js.map +1 -1
- package/build/component/feature/apiconnector/questions.d.ts +15 -15
- package/build/component/feature/apiconnector/questions.d.ts.map +1 -1
- package/build/component/feature/apiconnector/questions.js +138 -93
- package/build/component/feature/apiconnector/questions.js.map +1 -1
- package/build/component/feature/apiconnector/utils.d.ts +1 -1
- package/build/component/feature/apiconnector/utils.d.ts.map +1 -1
- package/build/component/feature/apiconnector/utils.js +1 -1
- package/build/component/feature/apiconnector/utils.js.map +1 -1
- package/build/component/feature/bot/bot.js +14 -14
- package/build/component/feature/bot/bot.js.map +1 -1
- package/build/component/feature/bot/question.js +4 -4
- package/build/component/feature/bot/question.js.map +1 -1
- package/build/component/feature/cicd/cicd.js +2 -2
- package/build/component/feature/cicd/cicd.js.map +1 -1
- package/build/component/feature/cicd/constants.d.ts +3 -3
- package/build/component/feature/cicd/constants.d.ts.map +1 -1
- package/build/component/feature/cicd/constants.js +3 -3
- package/build/component/feature/cicd/constants.js.map +1 -1
- package/build/component/feature/cicd/errors.js +3 -3
- package/build/component/feature/cicd/errors.js.map +1 -1
- package/build/component/feature/cicd/existingTemplatesStat.js +2 -2
- package/build/component/feature/cicd/existingTemplatesStat.js.map +1 -1
- package/build/component/feature/cicd/questions.d.ts +5 -5
- package/build/component/feature/cicd/questions.d.ts.map +1 -1
- package/build/component/feature/cicd/questions.js +38 -25
- package/build/component/feature/cicd/questions.js.map +1 -1
- package/build/component/feature/spfx.js +1 -1
- package/build/component/feature/spfx.js.map +1 -1
- package/build/component/feature/sso.js +2 -2
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/feature/tab.js +1 -1
- package/build/component/feature/tab.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +3 -2
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/question.d.ts +2 -2
- package/build/component/generator/officeAddin/question.d.ts.map +1 -1
- package/build/component/generator/officeAddin/question.js +14 -12
- package/build/component/generator/officeAddin/question.js.map +1 -1
- package/build/component/generator/spfxGenerator.js +1 -1
- package/build/component/generator/spfxGenerator.js.map +1 -1
- package/build/component/generator/utils.d.ts +1 -0
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +8 -3
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/middleware/envMW.js +1 -1
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/migrate.js +3 -3
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +1 -0
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/question.d.ts +12 -13
- package/build/component/question.d.ts.map +1 -1
- package/build/component/question.js +176 -159
- package/build/component/question.js.map +1 -1
- package/build/component/resource/apim/services/apimService.d.ts.map +1 -1
- package/build/component/resource/apim/services/apimService.js +23 -44
- package/build/component/resource/apim/services/apimService.js.map +1 -1
- package/build/component/resource/appManifest/appManifest.js +3 -3
- package/build/component/resource/appManifest/appManifest.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +54 -18
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.d.ts +8 -1
- package/build/component/resource/appManifest/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.js +82 -10
- package/build/component/resource/appManifest/appStudioClient.js.map +1 -1
- package/build/component/resource/appManifest/authSvcClient.d.ts +1 -1
- package/build/component/resource/appManifest/authSvcClient.d.ts.map +1 -1
- package/build/component/resource/appManifest/authSvcClient.js +4 -3
- package/build/component/resource/appManifest/authSvcClient.js.map +1 -1
- package/build/component/resource/appManifest/constants.d.ts +1 -0
- package/build/component/resource/appManifest/constants.d.ts.map +1 -1
- package/build/component/resource/appManifest/constants.js +1 -0
- package/build/component/resource/appManifest/constants.js.map +1 -1
- package/build/component/resource/appManifest/errors.d.ts +2 -46
- package/build/component/resource/appManifest/errors.d.ts.map +1 -1
- package/build/component/resource/appManifest/errors.js +9 -89
- package/build/component/resource/appManifest/errors.js.map +1 -1
- package/build/component/resource/appManifest/interfaces/IValidationResult.d.ts +28 -0
- package/build/component/resource/appManifest/interfaces/IValidationResult.d.ts.map +1 -0
- package/build/component/resource/appManifest/interfaces/IValidationResult.js +5 -0
- package/build/component/resource/appManifest/interfaces/IValidationResult.js.map +1 -0
- package/build/component/resource/appManifest/questions.d.ts +2 -2
- package/build/component/resource/appManifest/questions.d.ts.map +1 -1
- package/build/component/resource/appManifest/questions.js +16 -10
- package/build/component/resource/appManifest/questions.js.map +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.js +4 -4
- package/build/component/resource/appManifest/utils/ManifestUtils.js.map +1 -1
- package/build/component/resource/azureSql/clients/management.js +1 -1
- package/build/component/resource/azureSql/clients/management.js.map +1 -1
- package/build/component/resource/azureStorage/configs.js +2 -2
- package/build/component/resource/azureStorage/configs.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts +5 -0
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +7 -0
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +2 -2
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/depsChecker/bicepChecker.js +11 -11
- package/build/component/utils/depsChecker/bicepChecker.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts +7 -7
- package/build/component/utils/depsChecker/common.js +7 -7
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/core/FxCore.js +2 -2
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +5 -10
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/downloadSample.js +1 -1
- package/build/core/downloadSample.js.map +1 -1
- package/build/core/error.d.ts +2 -1
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +8 -2
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.js +2 -2
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
- package/build/core/middleware/projectMigrator.js +4 -4
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +2 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +43 -12
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/questionModel.js +20 -20
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +1 -0
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts +1 -0
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +9 -0
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts +1 -0
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +5 -2
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts +2 -0
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +54 -2
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts +3 -0
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +175 -9
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts +1 -0
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +6 -3
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/question.d.ts +16 -16
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +264 -209
- package/build/core/question.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +13 -16
- package/templates/core/v3Migration/csharp.app.local.yml +2 -2
- package/templates/core/v3Migration/csharp.app.yml +5 -5
- package/templates/core/v3Migration/js.ts.app.local.yml +7 -2
- package/templates/core/v3Migration/js.ts.app.yml +30 -8
- package/templates/core/v3Migration/spfx.app.yml +4 -4
- package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.csharp.workflow.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.js.workflow.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.workflow.zip +0 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.csharp.non-sso.zip +0 -0
- package/templates/fallback/tab.js.dashboard.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.dashboard.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +19 -19
- package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +19 -19
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +19 -22
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +18 -22
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +2 -6
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +1 -5
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +2 -6
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +1 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funcToolChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"funcToolChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngrokChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/ngrokChecker.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAY,MAAM,gBAAgB,CAAC;AAYzE,qBAAa,YAAa,YAAW,WAAW;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;YAIzB,WAAW;IAmBZ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAehD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ngrokChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/ngrokChecker.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAY,MAAM,gBAAgB,CAAC;AAYzE,qBAAa,YAAa,YAAW,WAAW;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;YAIzB,WAAW;IAmBZ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAehD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B,iBAAiB,IAAI,MAAM;IAIrB,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAyBnC,wBAAwB;YAcxB,QAAQ;IAwBtB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,eAAe;YAIT,oBAAoB;YAuBpB,MAAM;YAoBN,OAAO;YAWP,YAAY;IAS1B,OAAO,CAAC,MAAM,CAAC,oBAAoB;YA0BrB,cAAc;IAuC5B,OAAO,CAAC,cAAc;CAGvB"}
|
|
@@ -69,7 +69,7 @@ class NgrokChecker {
|
|
|
69
69
|
await this.handleInstallNgrokFailed();
|
|
70
70
|
}
|
|
71
71
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.ngrokInstallCompleted);
|
|
72
|
-
await this._logger.info(message_1.Messages.finishInstallNgrok.replace("@NameVersion", displayNgrokName));
|
|
72
|
+
await this._logger.info(message_1.Messages.finishInstallNgrok().replace("@NameVersion", displayNgrokName));
|
|
73
73
|
}
|
|
74
74
|
getNgrokBinFolder() {
|
|
75
75
|
return path.join(this.getDefaultInstallPath(), "node_modules", "ngrok", "bin");
|
|
@@ -98,8 +98,8 @@ class NgrokChecker {
|
|
|
98
98
|
}
|
|
99
99
|
async handleInstallNgrokFailed() {
|
|
100
100
|
await this.cleanup();
|
|
101
|
-
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.ngrokInstallError, telemetry_1.TelemtryMessages.failedToInstallNgrok, message_1.Messages.failToValidateNgrok.replace("@NameVersion", displayNgrokName));
|
|
102
|
-
throw new depsError_1.DepsCheckerError(message_1.Messages.failToInstallNgrok.split("@NameVersion").join(displayNgrokName), helpLink_1.ngrokInstallHelpLink);
|
|
101
|
+
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.ngrokInstallError, telemetry_1.TelemtryMessages.failedToInstallNgrok, message_1.Messages.failToValidateNgrok().replace("@NameVersion", displayNgrokName));
|
|
102
|
+
throw new depsError_1.DepsCheckerError(message_1.Messages.failToInstallNgrok().split("@NameVersion").join(displayNgrokName), helpLink_1.ngrokInstallHelpLink);
|
|
103
103
|
}
|
|
104
104
|
async validate() {
|
|
105
105
|
let isVersionSupported = false;
|
|
@@ -122,7 +122,7 @@ class NgrokChecker {
|
|
|
122
122
|
}
|
|
123
123
|
handleNpmNotFound() {
|
|
124
124
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.npmNotFound);
|
|
125
|
-
throw new depsError_1.DepsCheckerError(message_1.Messages.needInstallNgrok.replace("@NameVersion", displayNgrokName), helpLink_1.ngrokInstallHelpLink);
|
|
125
|
+
throw new depsError_1.DepsCheckerError(message_1.Messages.needInstallNgrok().replace("@NameVersion", displayNgrokName), helpLink_1.ngrokInstallHelpLink);
|
|
126
126
|
}
|
|
127
127
|
getDefaultInstallPath() {
|
|
128
128
|
return path.join(os.homedir(), `.${teamsfx_api_1.ConfigFolderName}`, "bin", "ngrok");
|
|
@@ -192,7 +192,7 @@ class NgrokChecker {
|
|
|
192
192
|
return properties;
|
|
193
193
|
}
|
|
194
194
|
async doInstallNgrok() {
|
|
195
|
-
await this._logger.info(message_1.Messages.startInstallNgrok.replace("@NameVersion", displayNgrokName));
|
|
195
|
+
await this._logger.info(message_1.Messages.startInstallNgrok().replace("@NameVersion", displayNgrokName));
|
|
196
196
|
try {
|
|
197
197
|
const npmCommand = this.getExecCommand("npm");
|
|
198
198
|
const result = await cpUtils_1.cpUtils.tryExecuteCommand(undefined, this._logger, { timeout: timeout, shell: false }, npmCommand, "install",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngrokChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/ngrokChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAA0D;AAE1D,mDAA4D;AAC5D,4CAAgD;AAChD,iEAAqE;AACrE,6CAA0C;AAC1C,2CAA2C;AAC3C,qDAAgG;AAGhG,gDAAyE;AACzE,iDAA+C;AAE/C,MAAM,SAAS,GAAG,OAAO,CAAC;AAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC;AACtC,MAAM,wBAAwB,GAAG,CAAC,SAAS,CAAC,CAAC;AAC7C,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,CAAC;AACrC,MAAM,gBAAgB,GAAG,GAAG,SAAS,IAAI,qBAAqB,EAAE,CAAC;AAEjE,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,YAAY;IAIvB,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,WAAoB,EACpB,KAAwB;QAExB,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,sBAAQ,CAAC,KAAK;YACpB,WAAW,EAAE,WAAW;YACxB,OAAO,EAAE,MAAM,IAAI,CAAC,OAAO,EAAE;YAC7B,OAAO,EAAE;gBACP,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,qBAAqB;gBACrC,UAAU,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACtC,iBAAiB,EAAE,wBAAwB;aAC5C;YACD,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC9B,IAAI,kBAAkB,GAAG,KAAK,EAC5B,WAAW,GAAG,KAAK,CAAC;QACtB,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACvD,kBAAkB;gBAChB,YAAY,KAAK,SAAS,IAAI,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC5E,WAAW,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC3D;QAAC,OAAO,KAAK,EAAE;YACd,aAAa;YACb,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SACtC;QACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAC1B;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC5B,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACvC;QAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,qBAAqB,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"ngrokChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/ngrokChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACzF,OAAO,EACL,gBAAgB,EAIjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,cAAM,WAAW;IACf,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,YAAY,EAAE,MAAM,CAAC;gBAEzB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAIlD;AAED,8BAAsB,WAAY,YAAW,WAAW;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;IACrE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChF,SAAS,CAAC,QAAQ,CAAC,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO;IACjG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAErD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;gBAEzB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,mBAAmB,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"nodeChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACzF,OAAO,EACL,gBAAgB,EAIjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKjD,cAAM,WAAW;IACf,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,YAAY,EAAE,MAAM,CAAC;gBAEzB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAIlD;AAED,8BAAsB,WAAY,YAAW,WAAW;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;IACrE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChF,SAAS,CAAC,QAAQ,CAAC,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO;IACjG,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAErD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;gBAEzB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,mBAAmB,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAgF/E,OAAO,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAYnE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,CACtB,WAAW,EAAE,OAAO,EACpB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,cAAc,CAAC,EAAE,MAAM,EACvB,KAAK,CAAC,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAe5B,OAAO,CAAC,MAAM,CAAC,cAAc;IAchB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;WAInB,uBAAuB,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;CAc3E;AAiBD,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,4CAA4C;IACrF,SAAS,CAAC,QAAQ,CAAC,KAAK,qBAAqB;IAC7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,MAAM;IACzC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,MAAM;cAEzB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIzD,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO;CAGzF;AAED,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,6CAA6C;IACtF,SAAS,CAAC,QAAQ,CAAC,KAAK,sBAAsB;IAC9C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,MAAM;IACzC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,SAA2B;cAC9C,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIzD,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO;CAGzF;AAED,qBAAa,kBAAmB,SAAQ,WAAW;IACjD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,qDAA0B;IAClE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,+CAA+C;IACxF,SAAS,CAAC,QAAQ,CAAC,KAAK,wBAAwB;IAChD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,SAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,SAA2B;cAE9C,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAQ/D,mBAAmB;IAajC,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO;CAOzF"}
|
|
@@ -33,7 +33,9 @@ class NodeChecker {
|
|
|
33
33
|
const currentVersion = await NodeChecker.getInstalledNodeVersion();
|
|
34
34
|
if (currentVersion === null) {
|
|
35
35
|
this._telemetry.sendUserErrorEvent(telemetry_1.DepsCheckerEvent.nodeNotFound, "Node.js can't be found.");
|
|
36
|
-
const error = new depsError_1.NodeNotFoundError(message_1.Messages.NodeNotFound
|
|
36
|
+
const error = new depsError_1.NodeNotFoundError(message_1.Messages.NodeNotFound()
|
|
37
|
+
.split("@NodeVersion")
|
|
38
|
+
.join(supportedVersions[supportedVersions.length - 1]), this._nodeNotFoundHelpLink);
|
|
37
39
|
return await this.getDepsInfo(false, supportedVersions, undefined, error);
|
|
38
40
|
}
|
|
39
41
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.nodeVersion, {
|
|
@@ -46,11 +48,13 @@ class NodeChecker {
|
|
|
46
48
|
: supportedVersions.map((v) => "v" + v).join(" ,");
|
|
47
49
|
this._telemetry.sendUserErrorEvent(this._nodeNotSupportedEvent, `Node.js ${currentVersion.version} is not supported.`);
|
|
48
50
|
return NodeChecker.isVersionError(this._minErrorVersion, this._maxErrorVersion, currentVersion)
|
|
49
|
-
? await this.getDepsInfo(false, supportedVersions, currentVersion.version, new depsError_1.NodeNotSupportedError(message_1.Messages.NodeNotSupported
|
|
51
|
+
? await this.getDepsInfo(false, supportedVersions, currentVersion.version, new depsError_1.NodeNotSupportedError(message_1.Messages.NodeNotSupported()
|
|
52
|
+
.split("@CurrentVersion")
|
|
50
53
|
.join(currentVersion.version)
|
|
51
54
|
.split("@SupportedVersions")
|
|
52
55
|
.join(supportedVersionsString), await this.getNodeNotSupportedHelpLink()))
|
|
53
|
-
: await this.getDepsInfo(true, supportedVersions, currentVersion.version, new depsError_1.NodeNotRecommendedError(message_1.Messages.NodeNotRecommended
|
|
56
|
+
: await this.getDepsInfo(true, supportedVersions, currentVersion.version, new depsError_1.NodeNotRecommendedError(message_1.Messages.NodeNotRecommended()
|
|
57
|
+
.split("@CurrentVersion")
|
|
54
58
|
.join(currentVersion.version)
|
|
55
59
|
.split("@SupportedVersions")
|
|
56
60
|
.join(supportedVersionsString), await this.getNodeNotSupportedHelpLink()));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,4DAA4B;AAC5B,mDAM8B;AAC9B,iDAA+C;AAC/C,qDAAyD;AACzD,gDAAyF;AACzF,4CAKsB;AAGtB,6CAA0C;AAE1C,MAAM,QAAQ,GAAG,SAAS,CAAC;AAE3B,MAAM,WAAW;IAIf,YAAY,OAAe,EAAE,YAAoB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AAED,MAAsB,WAAW;IAa/B,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,cAA+B;QAC9D,IAAI,iBAAiB,GAAa,EAAE,CAAC;QACrC,IAAI;YACF,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,CAAC,CAAC;YAEjF,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,iDAAiD,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CACtF,CAAC;YAEF,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,uBAAuB,EAAE,CAAC;YACnE,IAAI,cAAc,KAAK,IAAI,EAAE;gBAC3B,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAChC,4BAAgB,CAAC,YAAY,EAC7B,yBAAyB,CAC1B,CAAC;gBACF,MAAM,KAAK,GAAG,IAAI,6BAAiB,CACjC,kBAAQ,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"nodeChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ async function downloadToTempFile(url, callback) {
|
|
|
43
43
|
});
|
|
44
44
|
response.data.pipe(writer);
|
|
45
45
|
if (response.status !== 200) {
|
|
46
|
-
throw new Error(constant_1.Messages.failToDownloadFromUrl
|
|
46
|
+
throw new Error(constant_1.Messages.failToDownloadFromUrl()
|
|
47
47
|
.replace(/@Url/g, url)
|
|
48
48
|
.replace(/@Status/g, response.status.toString()));
|
|
49
49
|
}
|
|
@@ -74,7 +74,7 @@ class VxTestAppChecker {
|
|
|
74
74
|
}
|
|
75
75
|
async resolve(installOptions) {
|
|
76
76
|
if (!this.isValidInstallOptions(installOptions)) {
|
|
77
|
-
return VxTestAppChecker.newDependencyStatusForInstallError(new depsError_1.VxTestAppCheckError(constant_1.Messages.failToValidateVxTestAppInstallOptions, constant_1.vxTestAppInstallHelpLink));
|
|
77
|
+
return VxTestAppChecker.newDependencyStatusForInstallError(new depsError_1.VxTestAppCheckError(constant_1.Messages.failToValidateVxTestAppInstallOptions(), constant_1.vxTestAppInstallHelpLink));
|
|
78
78
|
}
|
|
79
79
|
// check installation in project dir
|
|
80
80
|
const installInfo = await this.getInstallationInfo(installOptions);
|
|
@@ -92,7 +92,7 @@ class VxTestAppChecker {
|
|
|
92
92
|
await this.createSymlink(globalInstallDir, projectInstallDir);
|
|
93
93
|
// TODO: need to chmod to add executable permission for non-Windows OS
|
|
94
94
|
if (!(await this.isValidInstalltion(projectInstallDir, installOptions.version))) {
|
|
95
|
-
return VxTestAppChecker.newDependencyStatusForInstallError(new depsError_1.VxTestAppCheckError(constant_1.Messages.failToValidateVxTestApp, constant_1.vxTestAppInstallHelpLink));
|
|
95
|
+
return VxTestAppChecker.newDependencyStatusForInstallError(new depsError_1.VxTestAppCheckError(constant_1.Messages.failToValidateVxTestApp(), constant_1.vxTestAppInstallHelpLink));
|
|
96
96
|
}
|
|
97
97
|
return {
|
|
98
98
|
name: VxTestAppName,
|
|
@@ -109,7 +109,7 @@ class VxTestAppChecker {
|
|
|
109
109
|
}
|
|
110
110
|
async getInstallationInfo(installOptions) {
|
|
111
111
|
if (!this.isValidInstallOptions(installOptions)) {
|
|
112
|
-
return VxTestAppChecker.newDependencyStatusForInstallError(new depsError_1.VxTestAppCheckError(constant_1.Messages.failToValidateVxTestAppInstallOptions, constant_1.vxTestAppInstallHelpLink));
|
|
112
|
+
return VxTestAppChecker.newDependencyStatusForInstallError(new depsError_1.VxTestAppCheckError(constant_1.Messages.failToValidateVxTestAppInstallOptions(), constant_1.vxTestAppInstallHelpLink));
|
|
113
113
|
}
|
|
114
114
|
const installDir = path.join(installOptions.projectPath, VxTestAppDirRelPath);
|
|
115
115
|
if (!(await this.isValidInstalltion(installDir, installOptions.version))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vxTestAppChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/vxTestAppChecker.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,iDAA2B;AAC3B,mDAA6B;AAE7B,0DAA0B;AAC1B,8DAA6B;AAE7B,wDAA0D;AAC1D,4CAAqE;AAGrE,gDAAyF;AACzF,kCAA6C;AAC7C,0CAAiE;AAOjE,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,4FAA4F;AAC5F,MAAM,uBAAuB,GAAG,gBAAS,EAAE;IACzC,CAAC,CAAC,kCAAkC;IACpC,CAAC,CAAC,cAAO,EAAE;QACX,CAAC,CAAC,kCAAkC;QACpC,CAAC,CAAC,8BAA8B,CAAC;AAEnC,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;AAChF,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CACvC,EAAE,CAAC,OAAO,EAAE,EACZ,IAAI,8BAAgB,EAAE,EACtB,KAAK,EACL,8BAA8B,CAC/B,CAAC;AACF,MAAM,8BAA8B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACrD,kEAAkE;AAClE,MAAM,4BAA4B,GAChC,kJAAkJ,CAAC;AAErJ;;;MAGM;AACN,KAAK,UAAU,kBAAkB,CAC/B,GAAW,EACX,QAA6C;IAE7C,oBAAoB;IACpB,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAChD,IAAI;QACF,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACpC,YAAY,EAAE,QAAQ;YACtB,OAAO,EAAE,8BAA8B;SACxC,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;YAC3B,MAAM,IAAI,KAAK,CACb,mBAAQ,CAAC,qBAAqB;
|
|
1
|
+
{"version":3,"file":"vxTestAppChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/vxTestAppChecker.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,iDAA2B;AAC3B,mDAA6B;AAE7B,0DAA0B;AAC1B,8DAA6B;AAE7B,wDAA0D;AAC1D,4CAAqE;AAGrE,gDAAyF;AACzF,kCAA6C;AAC7C,0CAAiE;AAOjE,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,4FAA4F;AAC5F,MAAM,uBAAuB,GAAG,gBAAS,EAAE;IACzC,CAAC,CAAC,kCAAkC;IACpC,CAAC,CAAC,cAAO,EAAE;QACX,CAAC,CAAC,kCAAkC;QACpC,CAAC,CAAC,8BAA8B,CAAC;AAEnC,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;AAChF,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CACvC,EAAE,CAAC,OAAO,EAAE,EACZ,IAAI,8BAAgB,EAAE,EACtB,KAAK,EACL,8BAA8B,CAC/B,CAAC;AACF,MAAM,8BAA8B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACrD,kEAAkE;AAClE,MAAM,4BAA4B,GAChC,kJAAkJ,CAAC;AAErJ;;;MAGM;AACN,KAAK,UAAU,kBAAkB,CAC/B,GAAW,EACX,QAA6C;IAE7C,oBAAoB;IACpB,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAChD,IAAI;QACF,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAC/E,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACpC,YAAY,EAAE,QAAQ;YACtB,OAAO,EAAE,8BAA8B;SACxC,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;YAC3B,MAAM,IAAI,KAAK,CACb,mBAAQ,CAAC,qBAAqB,EAAE;iBAC7B,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;iBACrB,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CACnD,CAAC;SACH;QAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACvB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;KACtB;YAAS;QACR,cAAc,EAAE,CAAC;KAClB;AACH,CAAC;AAED,KAAK,UAAU,KAAK,CAAC,WAAmB,EAAE,eAAuB;IAC/D,6CAA6C;IAC7C,MAAM,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,GAAG,GAAG,IAAI,iBAAM,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AACrE,CAAC;AAED,MAAa,gBAAgB;IAI3B,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,cAA+B;QAClD,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE;YAC/C,OAAO,gBAAgB,CAAC,kCAAkC,CACxD,IAAI,+BAAmB,CACrB,mBAAQ,CAAC,qCAAqC,EAAE,EAChD,mCAAwB,CACzB,CACF,CAAC;SACH;QAED,oCAAoC;QACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACnE,IAAI,WAAW,CAAC,WAAW,EAAE;YAC3B,OAAO,WAAW,CAAC;SACpB;QAED,8CAA8C;QAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QACpF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE;YAC9E,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAClC,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;SACrE;QAED,+CAA+C;QAC/C,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QACrF,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAC9D,sEAAsE;QACtE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE;YAC/E,OAAO,gBAAgB,CAAC,kCAAkC,CACxD,IAAI,+BAAmB,CAAC,mBAAQ,CAAC,uBAAuB,EAAE,EAAE,mCAAwB,CAAC,CACtF,CAAC;SACH;QAED,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,sBAAQ,CAAC,SAAS;YACxB,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE,uBAAuB;YAChC,OAAO,EAAE;gBACP,gBAAgB,EAAE,KAAK;gBACvB,iBAAiB,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC3C,UAAU,EAAE,CAAC,iBAAiB,CAAC;aAChC;YACD,KAAK,EAAE,SAAS;SACjB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,cAA+B;QAC9D,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE;YAC/C,OAAO,gBAAgB,CAAC,kCAAkC,CACxD,IAAI,+BAAmB,CACrB,mBAAQ,CAAC,qCAAqC,EAAE,EAChD,mCAAwB,CACzB,CACF,CAAC;SACH;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAC9E,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE;YACxE,OAAO,gBAAgB,CAAC,kCAAkC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACpF;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QACrF,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,sBAAQ,CAAC,SAAS;YACxB,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE,uBAAuB;YAChC,OAAO,EAAE;gBACP,gBAAgB,EAAE,KAAK;gBACvB,iBAAiB,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC3C,UAAU,EAAE,CAAC,iBAAiB,CAAC;aAChC;YACD,KAAK,EAAE,SAAS;SACjB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAe,EAAE,UAAkB;QAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,kBAAkB,CAAC,WAAW,EAAE,KAAK,EAAE,WAAmB,EAAE,EAAE;YAClE,MAAM,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,OAAe;QACpC,MAAM,GAAG,GAAG,4BAA4B,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC;aACnE,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;aACpC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAEhC,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAc,EAAE,YAAoB;QAC9D,4CAA4C;QAC5C,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC1C,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;gBACzB,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aAC/B;SACF;QAAC,OAAO,KAAc,EAAE;YACvB,MAAM,SAAS,GAAG,KAA0B,CAAC;YAC7C,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC/B,MAAM,KAAK,CAAC;aACb;SACF;QACD,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO,MAAM,EAAE,CAAC,OAAO,CACrB,MAAM,EACN,YAAY;QACZ,mHAAmH;QACnH,UAAU,CACX,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,UAAkB,EAAE,OAAe;QAClE,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;QAC3E,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QAED,qBAAqB;QACrB,sDAAsD;QACtD,mDAAmD;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,qBAAqB,CAC3B,cAA+B;QAE/B,OAAO,CAAC,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,MAAK,SAAS,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,MAAK,SAAS,CAAC,CAAC;IAC/F,CAAC;IAEO,MAAM,CAAC,kCAAkC,CAAC,OAAgB;QAChE,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,sBAAQ,CAAC,SAAS;YACxB,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,uBAAuB;YAChC,OAAO,EAAE;gBACP,gBAAgB,EAAE,KAAK;gBACvB,iBAAiB,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;aAC1D;YACD,KAAK,EAAE,SAAS;SACjB,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,kCAAkC,CAC/C,KAAuB,EACvB,OAAgB;QAEhB,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,sBAAQ,CAAC,SAAS;YACxB,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,uBAAuB;YAChC,OAAO,EAAE;gBACP,gBAAgB,EAAE,KAAK;gBACvB,iBAAiB,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;aAC1D;YACD,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC;CACF;AA3KD,4CA2KC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,eAAe,EACf,OAAO,EAER,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,eAAe,EACf,OAAO,EAER,MAAM,wBAAwB,CAAC;AA0BhC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;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;IAStD;;;;;;;OAOG;IACU,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAsD9D,mBAAmB;IA+DjC,OAAO,CAAC,wBAAwB;YAsFlB,wBAAwB;YA8BxB,gBAAgB;YAmDhB,kBAAkB;YAuBlB,uBAAuB;YAcvB,uBAAuB;CAqCtC"}
|
|
@@ -14,13 +14,13 @@ const constants_1 = require("./constants");
|
|
|
14
14
|
const ps = tslib_1.__importStar(require("./process"));
|
|
15
15
|
const error_1 = require("../../core/error");
|
|
16
16
|
const localizeUtils_1 = require("../localizeUtils");
|
|
17
|
-
const installText = localizeUtils_1.getLocalizedString("debug.install");
|
|
18
|
-
const learnMoreText = localizeUtils_1.getLocalizedString("core.provision.learnMore");
|
|
17
|
+
const installText = () => localizeUtils_1.getLocalizedString("debug.install");
|
|
18
|
+
const learnMoreText = () => localizeUtils_1.getLocalizedString("core.provision.learnMore");
|
|
19
19
|
// TODO(xiaofhua): update help link for v3
|
|
20
20
|
const learnMoreUrl = "https://aka.ms/teamsfx-ca-certificate";
|
|
21
|
-
const warningMessage = localizeUtils_1.getLocalizedString("debug.warningMessage");
|
|
22
|
-
const confirmMessage = warningMessage + localizeUtils_1.getLocalizedString("debug.warningMessage2");
|
|
23
|
-
const trustCertificateCancelError = new teamsfx_api_1.UserError({
|
|
21
|
+
const warningMessage = () => localizeUtils_1.getLocalizedString("debug.warningMessage");
|
|
22
|
+
const confirmMessage = () => warningMessage() + localizeUtils_1.getLocalizedString("debug.warningMessage2");
|
|
23
|
+
const trustCertificateCancelError = () => new teamsfx_api_1.UserError({
|
|
24
24
|
source: error_1.CoreSource,
|
|
25
25
|
name: "TrustCertificateCancelError",
|
|
26
26
|
helpLink: learnMoreUrl,
|
|
@@ -247,7 +247,7 @@ class LocalCertificateManager {
|
|
|
247
247
|
if (os.type() === "Windows_NT") {
|
|
248
248
|
if (!(await this.waitForUserConfirm())) {
|
|
249
249
|
localCert.isTrusted = false;
|
|
250
|
-
localCert.error = trustCertificateCancelError;
|
|
250
|
+
localCert.error = trustCertificateCancelError();
|
|
251
251
|
return;
|
|
252
252
|
}
|
|
253
253
|
await this.trustCertificateWindows(localCert, thumbprint, friendlyName);
|
|
@@ -257,7 +257,7 @@ class LocalCertificateManager {
|
|
|
257
257
|
else if (os.type() === "Darwin") {
|
|
258
258
|
if (!(await this.waitForUserConfirm())) {
|
|
259
259
|
localCert.isTrusted = false;
|
|
260
|
-
localCert.error = trustCertificateCancelError;
|
|
260
|
+
localCert.error = trustCertificateCancelError();
|
|
261
261
|
return;
|
|
262
262
|
}
|
|
263
263
|
await ps.execShell(`security add-trusted-cert -p ssl -k "${os.homedir()}/Library/Keychains/login.keychain-db" "${localCert.certPath}"`);
|
|
@@ -287,13 +287,13 @@ class LocalCertificateManager {
|
|
|
287
287
|
if (this.ui) {
|
|
288
288
|
let userSelected;
|
|
289
289
|
do {
|
|
290
|
-
const res = await this.ui.showMessage("info", confirmMessage, true, learnMoreText, installText);
|
|
290
|
+
const res = await this.ui.showMessage("info", confirmMessage(), true, learnMoreText(), installText());
|
|
291
291
|
userSelected = res.isOk() ? res.value : undefined;
|
|
292
|
-
if (userSelected === learnMoreText) {
|
|
292
|
+
if (userSelected === learnMoreText()) {
|
|
293
293
|
this.ui.openUrl(learnMoreUrl);
|
|
294
294
|
}
|
|
295
|
-
} while (userSelected === learnMoreText);
|
|
296
|
-
return userSelected === installText;
|
|
295
|
+
} while (userSelected === learnMoreText());
|
|
296
|
+
return userSelected === installText();
|
|
297
297
|
}
|
|
298
298
|
// No dialog, always return true;
|
|
299
299
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localCertificateManager.js","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"localCertificateManager.js","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAehC,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,
|
|
1
|
+
{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAKhB,MAAM,wBAAwB,CAAC;AAehC,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,CAkB/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"}
|
|
@@ -22,12 +22,12 @@ function validateProjectSettings(projectSettings) {
|
|
|
22
22
|
return `solutionSettings.azureResources validation failed: ${validateRes}`;
|
|
23
23
|
}
|
|
24
24
|
validateRes = validateStringArray(solutionSettings.capabilities, [
|
|
25
|
-
constants_1.TabOptionItem.id,
|
|
26
|
-
constants_1.BotOptionItem.id,
|
|
27
|
-
constants_1.MessageExtensionItem.id,
|
|
28
|
-
constants_1.TabSPFxItem.id,
|
|
29
|
-
constants_1.TabSsoItem.id,
|
|
30
|
-
constants_1.BotSsoItem.id,
|
|
25
|
+
constants_1.TabOptionItem().id,
|
|
26
|
+
constants_1.BotOptionItem().id,
|
|
27
|
+
constants_1.MessageExtensionItem().id,
|
|
28
|
+
constants_1.TabSPFxItem().id,
|
|
29
|
+
constants_1.TabSsoItem().id,
|
|
30
|
+
constants_1.BotSsoItem().id,
|
|
31
31
|
]);
|
|
32
32
|
if (validateRes) {
|
|
33
33
|
return `solutionSettings.capabilities validation failed: ${validateRes}`;
|
|
@@ -77,17 +77,22 @@ function isValidProject(workspacePath) {
|
|
|
77
77
|
exports.isValidProject = isValidProject;
|
|
78
78
|
function isValidProjectV3(workspacePath) {
|
|
79
79
|
const filePath = path.resolve(workspacePath, teamsfx_api_1.SettingsFolderName, teamsfx_api_1.SettingsFileName);
|
|
80
|
-
if (
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
80
|
+
if (fs_extra_1.default.existsSync(filePath)) {
|
|
81
|
+
const projectSettings = fs_extra_1.default.readJsonSync(filePath);
|
|
82
|
+
if (!projectSettings.trackingId) {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
if (!projectSettings.version) {
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
return true;
|
|
86
89
|
}
|
|
87
|
-
|
|
88
|
-
|
|
90
|
+
const ymlFilePath = path.join(workspacePath, "teamsapp.yml");
|
|
91
|
+
const localYmlPath = path.join(workspacePath, "teamsapp.local.yml");
|
|
92
|
+
if (fs_extra_1.default.pathExistsSync(ymlFilePath) || fs_extra_1.default.pathExistsSync(localYmlPath)) {
|
|
93
|
+
return true;
|
|
89
94
|
}
|
|
90
|
-
return
|
|
95
|
+
return false;
|
|
91
96
|
}
|
|
92
97
|
exports.isValidProjectV3 = isValidProjectV3;
|
|
93
98
|
function isValidProjectV2(workspacePath) {
|
|
@@ -156,7 +161,7 @@ function isExistingTabApp(projectSettings) {
|
|
|
156
161
|
}
|
|
157
162
|
// Scenario: SSO is added to existing tab app
|
|
158
163
|
if (((_a = solutionSettings.capabilities) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
|
|
159
|
-
solutionSettings.capabilities.includes(constants_1.TabSsoItem.id)) {
|
|
164
|
+
solutionSettings.capabilities.includes(constants_1.TabSsoItem().id)) {
|
|
160
165
|
return true;
|
|
161
166
|
}
|
|
162
167
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAQgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,sDAQgC;AAChC,mDAA6B;AAC7B,mCAA+D;AAE/D,SAAgB,uBAAuB,CAAC,eAAgC;;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,gBAAgB;QAAE,OAAO,SAAS,CAAC;IACxD,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;IACnF,IAAI,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE;QACf,OAAO,sDAAsD,WAAW,EAAE,CAAC;KAC5E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAC/D,yBAAa,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../src/common/projectSettingsHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,20 @@
|
|
|
48
48
|
"configuration": "Ready for debug",
|
|
49
49
|
"suggested": false
|
|
50
50
|
},
|
|
51
|
+
{
|
|
52
|
+
"id": "todo-list-SPFx",
|
|
53
|
+
"title": "Todo List with SPFx",
|
|
54
|
+
"shortDescription": "Todo List app hosting on SharePoint",
|
|
55
|
+
"fullDescription": "Todo List with SPFx is a Todo List for individuals to manage his/her personal to-do items. This app is hosted on Sharepoint. There is no requirements to deploy Azure resources.",
|
|
56
|
+
"tags": [
|
|
57
|
+
"SharePoint",
|
|
58
|
+
"SPFx",
|
|
59
|
+
"TS"
|
|
60
|
+
],
|
|
61
|
+
"time": "1hr to run",
|
|
62
|
+
"configuration": "Manual configurations required",
|
|
63
|
+
"suggested": false
|
|
64
|
+
},
|
|
51
65
|
{
|
|
52
66
|
"id": "hello-world-in-meeting",
|
|
53
67
|
"title": "My First Meeting App",
|
|
@@ -91,6 +105,16 @@
|
|
|
91
105
|
"time": "5min to run",
|
|
92
106
|
"configuration": "Ready for debug",
|
|
93
107
|
"suggested": false
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
"id": "query-org-user-with-message-extension-sso",
|
|
111
|
+
"title": "Org User Search Connector",
|
|
112
|
+
"shortDescription": "Query Org User with Message Extension SSO",
|
|
113
|
+
"fullDescription": "This is a simple search-based message extension app demonstrating how to integrate with Bot Framework SDK, TeamsFx SDK and Microsoft Graph API to implement a feature that queries organization's user with single sign on (SSO) capability.",
|
|
114
|
+
"tags": ["Message extension", "SSO"],
|
|
115
|
+
"time": "5min to run",
|
|
116
|
+
"configuration": "Ready for debug",
|
|
117
|
+
"suggested": false
|
|
94
118
|
}
|
|
95
119
|
]
|
|
96
120
|
}
|
|
@@ -2,19 +2,9 @@
|
|
|
2
2
|
"baseUrl": "https://github.com/OfficeDev/TeamsFx-Samples/tree/v1.1.0/",
|
|
3
3
|
"defaultPackageLink": "https://github.com/OfficeDev/TeamsFx-Samples/archive/refs/tags/v1.1.0.zip",
|
|
4
4
|
"samples": [
|
|
5
|
-
{
|
|
6
|
-
"id": "hello-world-tab",
|
|
7
|
-
"title": "Hello World Tab with SSO",
|
|
8
|
-
"shortDescription": "A Hello World app of Microsoft Teams Tab app",
|
|
9
|
-
"fullDescription": "This is a Hello World app of Microsoft Teams Tab app which accomplishes very simple function like single-sign on. You can run this app locally or deploy it to Microsoft Azure. This app only has a Tab frontend.",
|
|
10
|
-
"tags": ["Tab", "TS", "SSO"],
|
|
11
|
-
"time": "5min to run",
|
|
12
|
-
"configuration": "Ready for debug",
|
|
13
|
-
"suggested": true
|
|
14
|
-
},
|
|
15
5
|
{
|
|
16
6
|
"id": "hello-world-tab-with-backend",
|
|
17
|
-
"title": "
|
|
7
|
+
"title": "Tab App with Azure Backned",
|
|
18
8
|
"shortDescription": "A Hello World app of Microsoft Teams Tab app which has a backend service",
|
|
19
9
|
"fullDescription": "This is a Hello World app of Microsoft Teams Tab app which accomplishes very simple function like single-sign on. You can run this app locally or deploy it to Microsoft Azure. This app has a Tab frontend and a backend service using Azure Function.",
|
|
20
10
|
"tags": ["Tab", "TS", "Azure function"],
|
|
@@ -22,16 +12,6 @@
|
|
|
22
12
|
"configuration": "Ready for debug",
|
|
23
13
|
"suggested": true
|
|
24
14
|
},
|
|
25
|
-
{
|
|
26
|
-
"id": "hello-world-bot",
|
|
27
|
-
"title": "Hello World Bot",
|
|
28
|
-
"shortDescription": "A Hello World app of Microsoft Teams Bot app",
|
|
29
|
-
"fullDescription": "This is a Hello World app of Microsoft Teams Bot app demonstrating how to create commands and build adaptive cards that best for automation.",
|
|
30
|
-
"tags": ["Bot", "TS", "Adaptive Cards"],
|
|
31
|
-
"time": "5min to run",
|
|
32
|
-
"configuration": "Ready for debug",
|
|
33
|
-
"suggested": true
|
|
34
|
-
},
|
|
35
15
|
{
|
|
36
16
|
"id": "graph-toolkit-contact-exporter",
|
|
37
17
|
"title": "Contact Exporter using Graph Toolkit",
|
|
@@ -54,7 +34,7 @@
|
|
|
54
34
|
},
|
|
55
35
|
{
|
|
56
36
|
"id": "bot-sso",
|
|
57
|
-
"title": "
|
|
37
|
+
"title": "Bot App with SSO Enabled",
|
|
58
38
|
"shortDescription": "A Hello World app of Microsoft Teams Bot app with SSO",
|
|
59
39
|
"fullDescription": "This is an extended Hello World app of Microsoft Teams Bot app demonstrating how to integrate with Bot Framework SDK, TeamsFx SDK, and Graph SDK to implement SSO (Single Sign-On) feature that retrieves profile photos for currently signed-in users.",
|
|
60
40
|
"tags": [
|
|
@@ -127,16 +107,6 @@
|
|
|
127
107
|
"configuration": "Manual configurations required",
|
|
128
108
|
"suggested": false
|
|
129
109
|
},
|
|
130
|
-
{
|
|
131
|
-
"id": "hello-world-tab-without-sso",
|
|
132
|
-
"title": "Hello World Tab",
|
|
133
|
-
"shortDescription": "A simple Microsft Teams Tab application displays static content",
|
|
134
|
-
"fullDescription": "This is a simple static tab application with tutorial to include single sign on features.",
|
|
135
|
-
"tags": ["Tab", "TS"],
|
|
136
|
-
"time": "5min to run",
|
|
137
|
-
"configuration": "Ready for debug",
|
|
138
|
-
"suggested": false
|
|
139
|
-
},
|
|
140
110
|
{
|
|
141
111
|
"id": "bot-proactive-messaging-teamsfx",
|
|
142
112
|
"title": "Proactive Messaging",
|