@microsoft/teamsfx-core 1.1.1 → 1.1.2-alpha.6397ec59.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/armInterface.d.ts +1 -1
- package/build/common/armInterface.d.ts.map +1 -1
- package/build/common/constants.d.ts +3 -2
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +3 -2
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts +8 -0
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -0
- package/build/common/deps-checker/checkerFactory.js +32 -0
- package/build/common/deps-checker/checkerFactory.js.map +1 -0
- package/build/common/deps-checker/constant/helpLink.d.ts +11 -0
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -0
- package/build/common/deps-checker/constant/helpLink.js +16 -0
- package/build/common/deps-checker/constant/helpLink.js.map +1 -0
- package/build/common/deps-checker/constant/message.d.ts +29 -0
- package/build/common/deps-checker/constant/message.d.ts.map +1 -0
- package/build/common/deps-checker/constant/message.js +57 -0
- package/build/common/deps-checker/constant/message.js.map +1 -0
- package/build/common/deps-checker/constant/telemetry.d.ts +41 -0
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -0
- package/build/common/deps-checker/constant/telemetry.js +49 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -0
- package/build/common/deps-checker/depsChecker.d.ts +24 -0
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -0
- package/build/common/deps-checker/depsChecker.js +13 -0
- package/build/common/deps-checker/depsChecker.js.map +1 -0
- package/build/common/deps-checker/depsError.d.ts +17 -0
- package/build/common/deps-checker/depsError.d.ts.map +1 -0
- package/build/common/deps-checker/depsError.js +42 -0
- package/build/common/deps-checker/depsError.js.map +1 -0
- package/build/common/deps-checker/depsLogger.d.ts +11 -0
- package/build/common/deps-checker/depsLogger.d.ts.map +1 -0
- package/build/common/deps-checker/depsLogger.js +5 -0
- package/build/common/deps-checker/depsLogger.js.map +1 -0
- package/build/common/deps-checker/depsManager.d.ts +35 -0
- package/build/common/deps-checker/depsManager.d.ts.map +1 -0
- package/build/common/deps-checker/depsManager.js +82 -0
- package/build/common/deps-checker/depsManager.js.map +1 -0
- package/build/common/deps-checker/depsTelemetry.d.ts +10 -0
- package/build/common/deps-checker/depsTelemetry.d.ts.map +1 -0
- package/build/common/deps-checker/depsTelemetry.js +5 -0
- package/build/common/deps-checker/depsTelemetry.js.map +1 -0
- package/build/common/deps-checker/internal/dotnetChecker.d.ts +50 -0
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/dotnetChecker.js +406 -0
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -0
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +40 -0
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/funcToolChecker.js +279 -0
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -0
- package/build/common/deps-checker/internal/ngrokChecker.d.ts +28 -0
- package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/ngrokChecker.js +183 -0
- package/build/common/deps-checker/internal/ngrokChecker.js.map +1 -0
- package/build/common/deps-checker/internal/nodeChecker.d.ts +40 -0
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/nodeChecker.js +144 -0
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -0
- package/build/common/deps-checker/util/cpUtils.d.ts +24 -0
- package/build/common/deps-checker/util/cpUtils.d.ts.map +1 -0
- package/build/common/deps-checker/util/cpUtils.js +99 -0
- package/build/common/deps-checker/util/cpUtils.js.map +1 -0
- package/build/common/deps-checker/util/progressIndicator.d.ts +3 -0
- package/build/common/deps-checker/util/progressIndicator.d.ts.map +1 -0
- package/build/common/deps-checker/util/progressIndicator.js +18 -0
- package/build/common/deps-checker/util/progressIndicator.js.map +1 -0
- package/build/common/deps-checker/util/system.d.ts +5 -0
- package/build/common/deps-checker/util/system.d.ts.map +1 -0
- package/build/common/deps-checker/util/system.js +24 -0
- package/build/common/deps-checker/util/system.js.map +1 -0
- package/build/common/index.d.ts +1 -0
- package/build/common/index.d.ts.map +1 -1
- package/build/common/index.js +1 -0
- package/build/common/index.js.map +1 -1
- package/build/common/local/constants.d.ts +108 -0
- package/build/common/local/constants.d.ts.map +1 -0
- package/build/common/local/constants.js +114 -0
- package/build/common/local/constants.js.map +1 -0
- package/build/common/local/localEnvManager.d.ts +19 -0
- package/build/common/local/localEnvManager.d.ts.map +1 -0
- package/build/common/local/localEnvManager.js +82 -0
- package/build/common/local/localEnvManager.js.map +1 -0
- package/build/{plugins/resource/localdebug/localEnvMulti.d.ts → common/local/localEnvProvider.d.ts} +2 -2
- package/build/common/local/localEnvProvider.d.ts.map +1 -0
- package/build/{plugins/resource/localdebug/localEnvMulti.js → common/local/localEnvProvider.js} +12 -12
- package/build/common/local/localEnvProvider.js.map +1 -0
- package/build/common/local/localSettingsHelper.d.ts +3 -0
- package/build/common/local/localSettingsHelper.d.ts.map +1 -0
- package/build/common/local/localSettingsHelper.js +125 -0
- package/build/common/local/localSettingsHelper.js.map +1 -0
- package/build/common/local/npmLogHelper.d.ts +11 -0
- package/build/common/local/npmLogHelper.d.ts.map +1 -0
- package/build/common/local/npmLogHelper.js +82 -0
- package/build/common/local/npmLogHelper.js.map +1 -0
- package/build/common/local/projectSettingsHelper.d.ts +10 -0
- package/build/common/local/projectSettingsHelper.d.ts.map +1 -0
- package/build/common/local/projectSettingsHelper.js +34 -0
- package/build/common/local/projectSettingsHelper.js.map +1 -0
- package/build/common/localSettingsProvider.d.ts +3 -3
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +12 -10
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/samples-config.json +14 -0
- package/build/common/templatesActions.d.ts +2 -0
- package/build/common/templatesActions.d.ts.map +1 -1
- package/build/common/templatesActions.js +33 -1
- package/build/common/templatesActions.js.map +1 -1
- package/build/common/tools.d.ts +11 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +30 -27
- package/build/common/tools.js.map +1 -1
- package/build/core/SolutionPluginContainer.d.ts +2 -1
- package/build/core/SolutionPluginContainer.d.ts.map +1 -1
- package/build/core/SolutionPluginContainer.js +9 -1
- package/build/core/SolutionPluginContainer.js.map +1 -1
- package/build/core/dependencyChecker.d.ts +1 -0
- package/build/core/dependencyChecker.d.ts.map +1 -0
- package/build/core/dependencyChecker.js +2 -0
- package/build/core/dependencyChecker.js.map +1 -0
- package/build/core/environment.d.ts +5 -5
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +40 -25
- package/build/core/environment.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 +7 -3
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +53 -15
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +704 -518
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +23 -12
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/envInfoLoader.d.ts +5 -1
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +52 -46
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.d.ts +3 -0
- package/build/core/middleware/envInfoLoaderV3.d.ts.map +1 -0
- package/build/core/middleware/envInfoLoaderV3.js +64 -0
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -0
- package/build/core/middleware/envInfoWriter.js +14 -31
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/middleware/envInfoWriterV3.d.ts +6 -0
- package/build/core/middleware/envInfoWriterV3.d.ts.map +1 -0
- package/build/core/middleware/envInfoWriterV3.js +63 -0
- package/build/core/middleware/envInfoWriterV3.js.map +1 -0
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +3 -5
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +1 -2
- package/build/core/middleware/localSettingsLoader.js.map +1 -1
- package/build/core/middleware/localSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/localSettingsWriter.js +7 -18
- package/build/core/middleware/localSettingsWriter.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +25 -57
- 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 +3 -6
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectSettingsLoaderV3.d.ts +4 -0
- package/build/core/middleware/projectSettingsLoaderV3.d.ts.map +1 -0
- package/build/core/middleware/projectSettingsLoaderV3.js +49 -0
- package/build/core/middleware/projectSettingsLoaderV3.js.map +1 -0
- package/build/core/middleware/projectSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsWriter.js +5 -12
- package/build/core/middleware/projectSettingsWriter.js.map +1 -1
- package/build/core/middleware/projectUpgrader.d.ts.map +1 -1
- package/build/core/middleware/projectUpgrader.js +7 -15
- package/build/core/middleware/projectUpgrader.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts +14 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +319 -23
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/solutionLoader.d.ts +3 -2
- package/build/core/middleware/solutionLoader.d.ts.map +1 -1
- package/build/core/middleware/solutionLoader.js +21 -23
- package/build/core/middleware/solutionLoader.js.map +1 -1
- package/build/core/middleware/solutionLoaderV3.d.ts +4 -0
- package/build/core/middleware/solutionLoaderV3.d.ts.map +1 -0
- package/build/core/middleware/solutionLoaderV3.js +19 -0
- package/build/core/middleware/solutionLoaderV3.js.map +1 -0
- package/build/core/question.d.ts +9 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +113 -3
- package/build/core/question.js.map +1 -1
- package/build/core/tools.d.ts +2 -1
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +19 -10
- package/build/core/tools.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +1 -10
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/apim/managers/apimManager.d.ts.map +1 -1
- package/build/plugins/resource/apim/managers/apimManager.js +5 -7
- package/build/plugins/resource/apim/managers/apimManager.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +106 -85
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +6 -1
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +6 -1
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/errors.js +2 -1
- package/build/plugins/resource/appstudio/errors.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +15 -12
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +2 -3
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +233 -443
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.js +12 -16
- package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +19 -0
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -0
- package/build/plugins/resource/appstudio/v3/index.js +35 -0
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -0
- package/build/plugins/resource/bot/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/index.js +5 -1
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +9 -11
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/constants.d.ts +1 -7
- package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/constants.js +2 -9
- package/build/plugins/resource/frontend/constants.js.map +1 -1
- package/build/plugins/resource/frontend/env.d.ts +21 -0
- package/build/plugins/resource/frontend/env.d.ts.map +1 -0
- package/build/plugins/resource/frontend/env.js +82 -0
- package/build/plugins/resource/frontend/env.js.map +1 -0
- package/build/plugins/resource/frontend/ops/deploy.d.ts +2 -1
- package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.js +2 -2
- package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts +2 -0
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +28 -16
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/utils/environment-utils.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils/environment-utils.js +4 -2
- package/build/plugins/resource/frontend/utils/environment-utils.js.map +1 -1
- package/build/plugins/resource/frontend/utils.d.ts +6 -1
- package/build/plugins/resource/frontend/utils.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils.js +17 -6
- package/build/plugins/resource/frontend/utils.js.map +1 -1
- package/build/plugins/resource/function/plugin.d.ts.map +1 -1
- package/build/plugins/resource/function/plugin.js +7 -9
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.d.ts +0 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/checker.js +2 -2
- package/build/plugins/resource/function/utils/depsChecker/checker.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/common.d.ts +2 -2
- package/build/plugins/resource/function/utils/depsChecker/common.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/common.js +6 -6
- package/build/plugins/resource/function/utils/depsChecker/common.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts +3 -2
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js +3 -2
- package/build/plugins/resource/function/utils/depsChecker/dotnetChecker.js.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts +0 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.d.ts.map +1 -1
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js +1 -23
- package/build/plugins/resource/function/utils/depsChecker/funcPluginAdapter.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +11 -13
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/keyvault/plugin.d.ts.map +1 -1
- package/build/plugins/resource/keyvault/plugin.js +7 -9
- package/build/plugins/resource/keyvault/plugin.js.map +1 -1
- package/build/plugins/resource/localdebug/index.d.ts +0 -7
- package/build/plugins/resource/localdebug/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/index.js +4 -499
- package/build/plugins/resource/localdebug/index.js.map +1 -1
- package/build/plugins/resource/localdebug/util/error.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/util/error.js +1 -1
- package/build/plugins/resource/localdebug/util/error.js.map +1 -1
- package/build/plugins/resource/localdebug/util/localService.d.ts +0 -1
- package/build/plugins/resource/localdebug/util/localService.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/util/localService.js +1 -40
- package/build/plugins/resource/localdebug/util/localService.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +39 -1
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +7 -9
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.js +3 -1
- package/build/plugins/resource/simpleauth/utils/common.js.map +1 -1
- package/build/plugins/resource/sql/config.d.ts +0 -1
- package/build/plugins/resource/sql/config.d.ts.map +1 -1
- package/build/plugins/resource/sql/config.js +0 -1
- package/build/plugins/resource/sql/config.js.map +1 -1
- package/build/plugins/resource/sql/constants.d.ts +1 -0
- package/build/plugins/resource/sql/constants.d.ts.map +1 -1
- package/build/plugins/resource/sql/constants.js +1 -0
- package/build/plugins/resource/sql/constants.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts +1 -0
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +1 -0
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/managementClient.d.ts +3 -1
- package/build/plugins/resource/sql/managementClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/managementClient.js +11 -2
- 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 +37 -27
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/sqlClient.js +15 -24
- package/build/plugins/resource/sql/sqlClient.js.map +1 -1
- package/build/plugins/resource/sql/utils/checkInput.js +2 -2
- package/build/plugins/resource/sql/utils/checkInput.js.map +1 -1
- package/build/plugins/resource/sql/utils/message.d.ts +0 -1
- package/build/plugins/resource/sql/utils/message.d.ts.map +1 -1
- package/build/plugins/resource/sql/utils/message.js +0 -1
- package/build/plugins/resource/sql/utils/message.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +0 -4
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts +18 -11
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +390 -131
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +13 -2
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +24 -26
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/constants.d.ts +14 -0
- package/build/plugins/solution/fx-solution/debug/constants.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/debug/constants.js +22 -0
- package/build/plugins/solution/fx-solution/debug/constants.js.map +1 -0
- package/build/plugins/solution/fx-solution/debug/error.d.ts +8 -0
- package/build/plugins/solution/fx-solution/debug/error.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/debug/error.js +32 -0
- package/build/plugins/solution/fx-solution/debug/error.js.map +1 -0
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts +4 -0
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +227 -0
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -0
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts +3 -0
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/debug/scaffolding.js +153 -0
- package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/certificate.d.ts +2 -2
- package/build/plugins/solution/fx-solution/debug/util/certificate.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/certificate.js +8 -9
- package/build/plugins/solution/fx-solution/debug/util/certificate.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/codespace.d.ts +0 -0
- package/build/plugins/solution/fx-solution/debug/util/codespace.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/codespace.js +0 -0
- package/build/plugins/solution/fx-solution/debug/util/codespace.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/launch.d.ts +0 -0
- package/build/plugins/solution/fx-solution/debug/util/launch.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/launch.js +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launch.js.map +1 -0
- package/build/plugins/solution/fx-solution/debug/util/localService.d.ts +3 -0
- package/build/plugins/solution/fx-solution/debug/util/localService.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/debug/util/localService.js +52 -0
- package/build/plugins/solution/fx-solution/debug/util/localService.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/ngrok.d.ts +0 -0
- package/build/plugins/solution/fx-solution/debug/util/ngrok.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/ngrok.js +2 -2
- package/build/plugins/solution/fx-solution/debug/util/ngrok.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/process.d.ts +0 -0
- package/build/plugins/solution/fx-solution/debug/util/process.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/process.js +0 -0
- package/build/plugins/solution/fx-solution/debug/util/process.js.map +1 -0
- package/build/plugins/solution/fx-solution/debug/util/settings.d.ts +2 -0
- package/build/plugins/solution/fx-solution/debug/util/settings.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/debug/util/settings.js +22 -0
- package/build/plugins/solution/fx-solution/debug/util/settings.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/tasks.d.ts +0 -0
- package/build/plugins/solution/fx-solution/debug/util/tasks.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug/util}/tasks.js +11 -11
- package/build/plugins/solution/fx-solution/debug/util/tasks.js.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/telemetry.d.ts +6 -6
- package/build/plugins/solution/fx-solution/debug/util/telemetry.d.ts.map +1 -0
- package/build/plugins/{resource/localdebug → solution/fx-solution/debug}/util/telemetry.js +12 -12
- package/build/plugins/solution/fx-solution/debug/util/telemetry.js.map +1 -0
- package/build/plugins/solution/fx-solution/index.d.ts +1 -0
- package/build/plugins/solution/fx-solution/index.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/index.js +1 -0
- package/build/plugins/solution/fx-solution/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +2 -2
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +2 -32
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +9 -5
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.d.ts +2 -2
- package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.js +13 -14
- package/build/plugins/solution/fx-solution/utils/depsChecker/bicepChecker.js.map +1 -1
- package/build/plugins/solution/fx-solution/utils/progressHelper.d.ts +2 -2
- package/build/plugins/solution/fx-solution/utils/progressHelper.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/utils/progressHelper.js +4 -4
- package/build/plugins/solution/fx-solution/utils/progressHelper.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/constants.d.ts +2 -0
- package/build/plugins/solution/fx-solution/v2/constants.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v2/constants.js +7 -0
- package/build/plugins/solution/fx-solution/v2/constants.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.js +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +7 -4
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +67 -25
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +9 -1
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +9 -0
- package/build/plugins/solution/fx-solution/v2/provisionLocal.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 +5 -0
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js +2 -1
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/addModule.d.ts +6 -0
- package/build/plugins/solution/fx-solution/v3/addModule.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/addModule.js +35 -0
- package/build/plugins/solution/fx-solution/v3/addModule.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts +37 -0
- package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/addResource.js +260 -0
- package/build/plugins/solution/fx-solution/v3/addResource.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/constants.d.ts +20 -0
- package/build/plugins/solution/fx-solution/v3/constants.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/constants.js +25 -0
- package/build/plugins/solution/fx-solution/v3/constants.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts +6 -0
- package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/deploy.js +78 -0
- package/build/plugins/solution/fx-solution/v3/deploy.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/error.d.ts +11 -0
- package/build/plugins/solution/fx-solution/v3/error.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/error.js +23 -0
- package/build/plugins/solution/fx-solution/v3/error.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/init.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/init.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/init.js +35 -0
- package/build/plugins/solution/fx-solution/v3/init.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provision.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/provision.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provision.js +124 -0
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js +13 -0
- package/build/plugins/solution/fx-solution/v3/provisionLocal.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/publish.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/publish.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/publish.js +15 -0
- package/build/plugins/solution/fx-solution/v3/publish.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/questions.d.ts +16 -0
- package/build/plugins/solution/fx-solution/v3/questions.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/questions.js +86 -0
- package/build/plugins/solution/fx-solution/v3/questions.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.d.ts +27 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.js +241 -0
- package/build/plugins/solution/fx-solution/v3/scaffold.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/solution.d.ts +32 -0
- package/build/plugins/solution/fx-solution/v3/solution.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/solution.js +45 -0
- package/build/plugins/solution/fx-solution/v3/solution.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/userTask.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v3/userTask.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/userTask.js +15 -0
- package/build/plugins/solution/fx-solution/v3/userTask.js.map +1 -0
- package/build/plugins/solution/fx-solution/v3/utils.d.ts +3 -0
- package/build/plugins/solution/fx-solution/v3/utils.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v3/utils.js +16 -0
- package/build/plugins/solution/fx-solution/v3/utils.js.map +1 -0
- package/build/plugins/solution/index.d.ts +1 -0
- package/build/plugins/solution/index.d.ts.map +1 -1
- package/build/plugins/solution/index.js +1 -0
- package/build/plugins/solution/index.js.map +1 -1
- package/build/plugins/solution/spfx-solution/constants.d.ts +2 -0
- package/build/plugins/solution/spfx-solution/constants.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/constants.js +7 -0
- package/build/plugins/solution/spfx-solution/constants.js.map +1 -0
- package/build/plugins/solution/spfx-solution/index.d.ts +2 -0
- package/build/plugins/solution/spfx-solution/index.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/index.js +5 -0
- package/build/plugins/solution/spfx-solution/index.js.map +1 -0
- package/build/plugins/solution/spfx-solution/init.d.ts +3 -0
- package/build/plugins/solution/spfx-solution/init.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/init.js +20 -0
- package/build/plugins/solution/spfx-solution/init.js.map +1 -0
- package/build/plugins/solution/spfx-solution/questions.d.ts +6 -0
- package/build/plugins/solution/spfx-solution/questions.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/questions.js +36 -0
- package/build/plugins/solution/spfx-solution/questions.js.map +1 -0
- package/build/plugins/solution/spfx-solution/scaffolding.d.ts +17 -0
- package/build/plugins/solution/spfx-solution/scaffolding.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/scaffolding.js +29 -0
- package/build/plugins/solution/spfx-solution/scaffolding.js.map +1 -0
- package/build/plugins/solution/spfx-solution/solution.d.ts +23 -0
- package/build/plugins/solution/spfx-solution/solution.d.ts.map +1 -0
- package/build/plugins/solution/spfx-solution/solution.js +29 -0
- package/build/plugins/solution/spfx-solution/solution.js.map +1 -0
- package/package.json +14 -4
- package/resource/deps-checker/dotnet-install.ps1 +1095 -0
- package/resource/deps-checker/dotnet-install.sh +1222 -0
- package/resource/strings.json +0 -1
- package/templates/plugins/resource/apim/bicep/apimConfiguration.bicep +16 -16
- package/templates/plugins/resource/apim/bicep/config.template.bicep +1 -1
- package/templates/plugins/resource/apim/bicep/provision.template.bicep +1 -1
- package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +28 -29
- package/templates/plugins/resource/bot/bicep/config.template.bicep +1 -1
- package/templates/plugins/resource/bot/bicep/provision.template.bicep +2 -2
- package/templates/plugins/resource/frontend/bicep/provision.template.bicep +1 -1
- package/templates/plugins/resource/function/bicep/config.template.bicep +1 -1
- package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep +33 -31
- package/templates/plugins/resource/function/bicep/provision.template.bicep +2 -2
- package/templates/plugins/resource/identity/bicep/provision.template.bicep +1 -1
- package/templates/plugins/resource/keyvault/bicep/provision.template.bicep +3 -2
- package/templates/plugins/resource/simpleauth/bicep/config.template.bicep +1 -1
- package/templates/plugins/resource/simpleauth/bicep/provision.template.bicep +2 -2
- package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep +20 -24
- package/templates/plugins/resource/simpleauth/version.txt +2 -1
- package/templates/plugins/resource/sql/bicep/provision.template.bicep +1 -1
- package/build/plugins/resource/localdebug/certificate.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/certificate.js.map +0 -1
- package/build/plugins/resource/localdebug/launch.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/launch.js.map +0 -1
- package/build/plugins/resource/localdebug/legacyPlugin.d.ts +0 -6
- package/build/plugins/resource/localdebug/legacyPlugin.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/legacyPlugin.js +0 -208
- package/build/plugins/resource/localdebug/legacyPlugin.js.map +0 -1
- package/build/plugins/resource/localdebug/localEnvMulti.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/localEnvMulti.js.map +0 -1
- package/build/plugins/resource/localdebug/settings.d.ts +0 -2
- package/build/plugins/resource/localdebug/settings.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/settings.js +0 -18
- package/build/plugins/resource/localdebug/settings.js.map +0 -1
- package/build/plugins/resource/localdebug/tasks.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/tasks.js.map +0 -1
- package/build/plugins/resource/localdebug/util/codespace.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/util/codespace.js.map +0 -1
- package/build/plugins/resource/localdebug/util/ngrok.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/util/ngrok.js.map +0 -1
- package/build/plugins/resource/localdebug/util/process.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/util/process.js.map +0 -1
- package/build/plugins/resource/localdebug/util/telemetry.d.ts.map +0 -1
- package/build/plugins/resource/localdebug/util/telemetry.js.map +0 -1
- package/templates/azure/config.bicep +0 -25
- package/templates/azure/main.bicep +0 -20
- package/templates/azure/provision/azureSql.bicep +0 -39
- package/templates/azure/provision/frontendHosting.bicep +0 -23
- package/templates/azure/provision/function.bicep +0 -79
- package/templates/azure/provision/simpleAuth.bicep +0 -44
- package/templates/azure/provision.bicep +0 -58
- package/templates/azure/teamsFx/bot.bicep +0 -34
- package/templates/azure/teamsFx/function.bicep +0 -71
- package/templates/azure/teamsFx/simpleAuth.bicep +0 -40
- package/templates/plugins/resource/aad/bicep/param.template.bicep +0 -6
- package/templates/plugins/resource/aad/bicep/variables.template.bicep +0 -13
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.LocalEnvManager = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
9
|
+
const path = tslib_1.__importStar(require("path"));
|
|
10
|
+
const localSettingsHelper_1 = require("./localSettingsHelper");
|
|
11
|
+
const localSettingsProvider_1 = require("../localSettingsProvider");
|
|
12
|
+
const npmLogHelper_1 = require("./npmLogHelper");
|
|
13
|
+
const tools_1 = require("../tools");
|
|
14
|
+
const crypto_1 = require("../../core/crypto");
|
|
15
|
+
const error_1 = require("../../core/error");
|
|
16
|
+
class LocalEnvManager {
|
|
17
|
+
constructor(logger, telemetry) {
|
|
18
|
+
this.logger = logger;
|
|
19
|
+
this.telemetry = telemetry;
|
|
20
|
+
}
|
|
21
|
+
getLaunchInput(localSettings) {
|
|
22
|
+
var _a;
|
|
23
|
+
// return local teams app id
|
|
24
|
+
const localTeamsAppId = (_a = localSettings === null || localSettings === void 0 ? void 0 : localSettings.teamsApp) === null || _a === void 0 ? void 0 : _a.teamsAppId;
|
|
25
|
+
return { appId: localTeamsAppId };
|
|
26
|
+
}
|
|
27
|
+
async getLocalDebugEnvs(projectPath, projectSettings, localSettings) {
|
|
28
|
+
return await localSettingsHelper_1.convertToLocalEnvs(projectPath, projectSettings, localSettings, this.logger);
|
|
29
|
+
}
|
|
30
|
+
async getNpmInstallLogInfo() {
|
|
31
|
+
return await npmLogHelper_1.getNpmInstallLogInfo();
|
|
32
|
+
}
|
|
33
|
+
async getPortsInUse() { }
|
|
34
|
+
getProgrammingLanguage(projectSettings) {
|
|
35
|
+
return projectSettings.programmingLanguage;
|
|
36
|
+
}
|
|
37
|
+
getSkipNgrokConfig(localSettings) {
|
|
38
|
+
var _a;
|
|
39
|
+
return ((_a = localSettings === null || localSettings === void 0 ? void 0 : localSettings.bot) === null || _a === void 0 ? void 0 : _a.skipNgrok) === true;
|
|
40
|
+
}
|
|
41
|
+
async getLocalSettings(projectPath, cryptoOption) {
|
|
42
|
+
const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(projectPath);
|
|
43
|
+
const crypto = cryptoOption === undefined ? undefined : new crypto_1.LocalCrypto(cryptoOption.projectId);
|
|
44
|
+
return await this.retry(async () => {
|
|
45
|
+
return await localSettingsProvider.loadV2(crypto);
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
async getProjectSettings(projectPath) {
|
|
49
|
+
return await this.retry(async () => {
|
|
50
|
+
const projectSettingsPath = path.resolve(projectPath, `.${teamsfx_api_1.ConfigFolderName}`, teamsfx_api_1.InputConfigsFolderName, teamsfx_api_1.ProjectSettingsFileName);
|
|
51
|
+
if (!(await fs.pathExists(projectSettingsPath))) {
|
|
52
|
+
throw new teamsfx_api_1.UserError("FileNotFoundError", `Project settings file does not exist: ${projectSettingsPath}`, error_1.CoreSource);
|
|
53
|
+
}
|
|
54
|
+
try {
|
|
55
|
+
return await fs.readJson(projectSettingsPath);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
throw error_1.ReadFileError(error);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
// Retry logic when reading project config files in case of read-write conflict
|
|
63
|
+
async retry(func) {
|
|
64
|
+
let n = 0;
|
|
65
|
+
let error = undefined;
|
|
66
|
+
while (n <= 2) {
|
|
67
|
+
if (n !== 0) {
|
|
68
|
+
await tools_1.waitSeconds(n);
|
|
69
|
+
}
|
|
70
|
+
try {
|
|
71
|
+
return await func(n);
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
error = e;
|
|
75
|
+
++n;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
throw error;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
exports.LocalEnvManager = LocalEnvManager;
|
|
82
|
+
//# sourceMappingURL=localEnvManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localEnvManager.js","sourceRoot":"","sources":["../../../src/common/local/localEnvManager.ts"],"names":[],"mappings":"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"}
|
package/build/{plugins/resource/localdebug/localEnvMulti.d.ts → common/local/localEnvProvider.d.ts}
RENAMED
|
@@ -55,7 +55,7 @@ export declare const EnvKeysBotCustom: Readonly<{
|
|
|
55
55
|
SqlUserName: string;
|
|
56
56
|
SqlPassword: string;
|
|
57
57
|
}>;
|
|
58
|
-
export declare class
|
|
58
|
+
export declare class LocalEnvProvider {
|
|
59
59
|
static readonly LocalEnvFileName: string;
|
|
60
60
|
private readonly projectRoot;
|
|
61
61
|
constructor(workspaceFolder: string);
|
|
@@ -69,4 +69,4 @@ export declare class LocalEnvMultiProvider {
|
|
|
69
69
|
private loadLocalEnvFile;
|
|
70
70
|
private saveLocalEnvFile;
|
|
71
71
|
}
|
|
72
|
-
//# sourceMappingURL=
|
|
72
|
+
//# sourceMappingURL=localEnvProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localEnvProvider.d.ts","sourceRoot":"","sources":["../../../src/common/local/localEnvProvider.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5C,mBAAmB,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACjD;AAED,eAAO,MAAM,eAAe;;;;;;;;;;EAU1B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;EAUzB,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;EAK/B,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;EAUrB,CAAC;AAEH,eAAO,MAAM,YAAY;;;EAGvB,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;;;EAK3B,CAAC;AAGH,qBAAa,gBAAgB;IAC3B,gBAAuB,gBAAgB,EAAE,MAAM,CAAwB;IAEvE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,eAAe,EAAE,MAAM;IAItB,qBAAqB,CAChC,cAAc,EAAE,OAAO,EACvB,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,SAAS,CAAC;IASR,oBAAoB,IAAI,OAAO,CAAC,SAAS,CAAC;IAS1C,gBAAgB,CAAC,eAAe,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;IAS9D,aAAa,CACxB,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,WAAW,EAAE,SAAS,GAAG,SAAS,EAClC,OAAO,EAAE,SAAS,GAAG,SAAS,GAC7B,OAAO,CAAC,IAAI,CAAC;IAcT,qBAAqB,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,GAAG,SAAS;IAuB/E,oBAAoB,IAAI,SAAS;IAwBjC,gBAAgB,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS;YA6B9C,gBAAgB;YAyBhB,gBAAgB;CAoB/B"}
|
package/build/{plugins/resource/localdebug/localEnvMulti.js → common/local/localEnvProvider.js}
RENAMED
|
@@ -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.
|
|
5
|
+
exports.LocalEnvProvider = exports.EnvKeysBotCustom = exports.EnvKeysBotV1 = exports.EnvKeysBot = exports.EnvKeysBackendCustom = exports.EnvKeysBackend = exports.EnvKeysFrontend = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const dotenv = tslib_1.__importStar(require("dotenv"));
|
|
8
8
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
@@ -59,31 +59,31 @@ exports.EnvKeysBotCustom = Object.freeze({
|
|
|
59
59
|
SqlPassword: "SQL_PASSWORD",
|
|
60
60
|
});
|
|
61
61
|
// Manage local envs for multi-env project. For legacy supported one, see `localEnv.ts`.
|
|
62
|
-
class
|
|
62
|
+
class LocalEnvProvider {
|
|
63
63
|
constructor(workspaceFolder) {
|
|
64
64
|
this.projectRoot = workspaceFolder;
|
|
65
65
|
}
|
|
66
66
|
async loadFrontendLocalEnvs(includeBackend, includeAuth) {
|
|
67
|
-
const envs = await this.loadLocalEnvFile(path.join(this.projectRoot, constants_1.
|
|
67
|
+
const envs = await this.loadLocalEnvFile(path.join(this.projectRoot, constants_1.FolderName.Frontend, LocalEnvProvider.LocalEnvFileName), Object.values(exports.EnvKeysFrontend));
|
|
68
68
|
return envs !== null && envs !== void 0 ? envs : this.initFrontendLocalEnvs(includeBackend, includeAuth);
|
|
69
69
|
}
|
|
70
70
|
async loadBackendLocalEnvs() {
|
|
71
|
-
const envs = await this.loadLocalEnvFile(path.join(this.projectRoot, constants_1.
|
|
71
|
+
const envs = await this.loadLocalEnvFile(path.join(this.projectRoot, constants_1.FolderName.Function, LocalEnvProvider.LocalEnvFileName), Object.values(exports.EnvKeysBackend));
|
|
72
72
|
return envs !== null && envs !== void 0 ? envs : this.initBackendLocalEnvs();
|
|
73
73
|
}
|
|
74
74
|
async loadBotLocalEnvs(isMigrateFromV1) {
|
|
75
|
-
const envs = await this.loadLocalEnvFile(path.join(this.projectRoot, constants_1.
|
|
75
|
+
const envs = await this.loadLocalEnvFile(path.join(this.projectRoot, constants_1.FolderName.Bot, LocalEnvProvider.LocalEnvFileName), Object.values(exports.EnvKeysBot));
|
|
76
76
|
return envs !== null && envs !== void 0 ? envs : this.initBotLocalEnvs(isMigrateFromV1);
|
|
77
77
|
}
|
|
78
78
|
async saveLocalEnvs(frontendEnvs, backendEnvs, botEnvs) {
|
|
79
79
|
if (frontendEnvs !== undefined) {
|
|
80
|
-
await this.saveLocalEnvFile(path.join(this.projectRoot, constants_1.
|
|
80
|
+
await this.saveLocalEnvFile(path.join(this.projectRoot, constants_1.FolderName.Frontend), frontendEnvs);
|
|
81
81
|
}
|
|
82
82
|
if (backendEnvs !== undefined) {
|
|
83
|
-
await this.saveLocalEnvFile(path.join(this.projectRoot, constants_1.
|
|
83
|
+
await this.saveLocalEnvFile(path.join(this.projectRoot, constants_1.FolderName.Function), backendEnvs);
|
|
84
84
|
}
|
|
85
85
|
if (botEnvs !== undefined) {
|
|
86
|
-
await this.saveLocalEnvFile(path.join(this.projectRoot, constants_1.
|
|
86
|
+
await this.saveLocalEnvFile(path.join(this.projectRoot, constants_1.FolderName.Bot), botEnvs);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
initFrontendLocalEnvs(includeBackend, includeAuth) {
|
|
@@ -174,7 +174,7 @@ class LocalEnvMultiProvider {
|
|
|
174
174
|
}
|
|
175
175
|
async saveLocalEnvFile(folder, envs) {
|
|
176
176
|
await fs.ensureDir(folder);
|
|
177
|
-
const envPath = path.join(folder,
|
|
177
|
+
const envPath = path.join(folder, LocalEnvProvider.LocalEnvFileName);
|
|
178
178
|
await fs.createFile(envPath);
|
|
179
179
|
await fs.writeFile(envPath, `# Following variables are generated by TeamsFx${os.EOL}`);
|
|
180
180
|
const teamsfxEntries = Object.entries(envs.teamsfxLocalEnvs);
|
|
@@ -188,6 +188,6 @@ class LocalEnvMultiProvider {
|
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
|
-
exports.
|
|
192
|
-
|
|
193
|
-
//# sourceMappingURL=
|
|
191
|
+
exports.LocalEnvProvider = LocalEnvProvider;
|
|
192
|
+
LocalEnvProvider.LocalEnvFileName = ".env.teamsfx.local";
|
|
193
|
+
//# sourceMappingURL=localEnvProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localEnvProvider.js","sourceRoot":"","sources":["../../../src/common/local/localEnvProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { Json, LogProvider, ProjectSettings } from "@microsoft/teamsfx-api";
|
|
2
|
+
export declare function convertToLocalEnvs(projectPath: string, projectSettings: ProjectSettings, localSettings: Json | undefined, logger?: LogProvider): Promise<Record<string, string>>;
|
|
3
|
+
//# sourceMappingURL=localSettingsHelper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EACJ,WAAW,EACX,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAuChC,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,IAAI,GAAG,SAAS,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAmIjC"}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.convertToLocalEnvs = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const os = tslib_1.__importStar(require("os"));
|
|
9
|
+
const tools_1 = require("../tools");
|
|
10
|
+
const constants_1 = require("./constants");
|
|
11
|
+
const localEnvProvider_1 = require("./localEnvProvider");
|
|
12
|
+
const projectSettingsHelper_1 = require("./projectSettingsHelper");
|
|
13
|
+
function getAuthServiceFolder() {
|
|
14
|
+
return `${os.homedir()}/.${teamsfx_api_1.ConfigFolderName}/localauth`;
|
|
15
|
+
}
|
|
16
|
+
function appendEnvWithPrefix(source, target, prefix) {
|
|
17
|
+
for (const key of Object.keys(source)) {
|
|
18
|
+
const prefixKey = `${prefix}${key}`;
|
|
19
|
+
if (target[prefixKey] === undefined || target[prefixKey] === "") {
|
|
20
|
+
// only append and do not override
|
|
21
|
+
target[prefixKey] = source[key];
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
// Note: this may be called before `localDebug` lifecycle, so do not throw if any value is missing
|
|
26
|
+
// TODO: mark this as obsolete after supporting new start command.
|
|
27
|
+
async function convertToLocalEnvs(projectPath, projectSettings, localSettings, logger) {
|
|
28
|
+
const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
|
|
29
|
+
const includeBackend = projectSettingsHelper_1.ProjectSettingsHelper.includeBackend(projectSettings);
|
|
30
|
+
const includeBot = projectSettingsHelper_1.ProjectSettingsHelper.includeBot(projectSettings);
|
|
31
|
+
const includeAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeAuth(projectSettings);
|
|
32
|
+
// prepare config maps
|
|
33
|
+
const authConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.auth);
|
|
34
|
+
const backendConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.backend);
|
|
35
|
+
const botConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.bot);
|
|
36
|
+
const frontendConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.frontend);
|
|
37
|
+
const teamsAppConfigs = teamsfx_api_1.ConfigMap.fromJSON(localSettings === null || localSettings === void 0 ? void 0 : localSettings.teamsApp);
|
|
38
|
+
// get config for local debug
|
|
39
|
+
const clientId = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ClientId);
|
|
40
|
+
const clientSecret = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ClientSecret);
|
|
41
|
+
const applicationIdUri = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.ApplicationIdUris);
|
|
42
|
+
const teamsAppTenantId = teamsAppConfigs === null || teamsAppConfigs === void 0 ? void 0 : teamsAppConfigs.get(constants_1.LocalSettingsTeamsAppKeys.TenantId);
|
|
43
|
+
const localAuthEndpoint = authConfigs === null || authConfigs === void 0 ? void 0 : authConfigs.get(constants_1.LocalSettingsAuthKeys.SimpleAuthServiceEndpoint);
|
|
44
|
+
const localTabEndpoint = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.TabEndpoint);
|
|
45
|
+
const localFuncEndpoint = backendConfigs === null || backendConfigs === void 0 ? void 0 : backendConfigs.get(constants_1.LocalSettingsBackendKeys.FunctionEndpoint);
|
|
46
|
+
const localEnvs = {};
|
|
47
|
+
if (includeFrontend) {
|
|
48
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.Browser] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.Browser);
|
|
49
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.Https] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.Https);
|
|
50
|
+
if (includeAuth) {
|
|
51
|
+
// frontend local envs
|
|
52
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.TeamsFxEndpoint] = localAuthEndpoint;
|
|
53
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.LoginUrl] = `${localTabEndpoint}/auth-start.html`;
|
|
54
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.ClientId] = clientId;
|
|
55
|
+
// auth local envs (auth is only required by frontend)
|
|
56
|
+
localEnvs[constants_1.LocalEnvAuthKeys.Urls] = localAuthEndpoint;
|
|
57
|
+
localEnvs[constants_1.LocalEnvAuthKeys.ClientId] = clientId;
|
|
58
|
+
localEnvs[constants_1.LocalEnvAuthKeys.ClientSecret] = clientSecret;
|
|
59
|
+
localEnvs[constants_1.LocalEnvAuthKeys.IdentifierUri] = applicationIdUri;
|
|
60
|
+
localEnvs[constants_1.LocalEnvAuthKeys.AadMetadataAddress] = `https://login.microsoftonline.com/${teamsAppTenantId}/v2.0/.well-known/openid-configuration`;
|
|
61
|
+
localEnvs[constants_1.LocalEnvAuthKeys.OauthAuthority] = `https://login.microsoftonline.com/${teamsAppTenantId}`;
|
|
62
|
+
localEnvs[constants_1.LocalEnvAuthKeys.TabEndpoint] = localTabEndpoint;
|
|
63
|
+
localEnvs[constants_1.LocalEnvAuthKeys.AllowedAppIds] = tools_1.getAllowedAppIds().join(";");
|
|
64
|
+
localEnvs[constants_1.LocalEnvAuthKeys.ServicePath] = getAuthServiceFolder();
|
|
65
|
+
}
|
|
66
|
+
if (includeBackend) {
|
|
67
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.FuncEndpoint] = localFuncEndpoint;
|
|
68
|
+
localEnvs[constants_1.LocalEnvFrontendKeys.FuncName] = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.defaultFunctionName;
|
|
69
|
+
localEnvs[constants_1.LocalEnvBackendKeys.FuncWorkerRuntime] = "node";
|
|
70
|
+
// function local envs
|
|
71
|
+
localEnvs[constants_1.LocalEnvBackendKeys.ClientId] = clientId;
|
|
72
|
+
localEnvs[constants_1.LocalEnvBackendKeys.ClientSecret] = clientSecret;
|
|
73
|
+
localEnvs[constants_1.LocalEnvBackendKeys.AuthorityHost] = "https://login.microsoftonline.com";
|
|
74
|
+
localEnvs[constants_1.LocalEnvBackendKeys.TenantId] = teamsAppTenantId;
|
|
75
|
+
localEnvs[constants_1.LocalEnvBackendKeys.ApiEndpoint] = localFuncEndpoint;
|
|
76
|
+
localEnvs[constants_1.LocalEnvBackendKeys.ApplicationIdUri] = applicationIdUri;
|
|
77
|
+
localEnvs[constants_1.LocalEnvBackendKeys.AllowedAppIds] = tools_1.getAllowedAppIds().join(";");
|
|
78
|
+
}
|
|
79
|
+
localEnvs[constants_1.LocalEnvCertKeys.SslCrtFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.SslCertFile);
|
|
80
|
+
localEnvs[constants_1.LocalEnvCertKeys.SslKeyFile] = frontendConfigs === null || frontendConfigs === void 0 ? void 0 : frontendConfigs.get(constants_1.LocalSettingsFrontendKeys.SslKeyFile);
|
|
81
|
+
}
|
|
82
|
+
if (includeBot) {
|
|
83
|
+
// bot local env
|
|
84
|
+
if (projectSettingsHelper_1.ProjectSettingsHelper.isMigrateFromV1(projectSettings)) {
|
|
85
|
+
localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotId);
|
|
86
|
+
localEnvs[constants_1.LocalEnvBotKeysMigratedFromV1.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotPassword);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
localEnvs[constants_1.LocalEnvBotKeys.BotId] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotId);
|
|
90
|
+
localEnvs[constants_1.LocalEnvBotKeys.BotPassword] = botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotPassword);
|
|
91
|
+
localEnvs[constants_1.LocalEnvBotKeys.ClientId] = clientId;
|
|
92
|
+
localEnvs[constants_1.LocalEnvBotKeys.ClientSecret] = clientSecret;
|
|
93
|
+
localEnvs[constants_1.LocalEnvBotKeys.TenantID] = teamsAppTenantId;
|
|
94
|
+
localEnvs[constants_1.LocalEnvBotKeys.OauthAuthority] = "https://login.microsoftonline.com";
|
|
95
|
+
localEnvs[constants_1.LocalEnvBotKeys.LoginEndpoint] = `${botConfigs === null || botConfigs === void 0 ? void 0 : botConfigs.get(constants_1.LocalSettingsBotKeys.BotEndpoint)}/auth-start.html`;
|
|
96
|
+
localEnvs[constants_1.LocalEnvBotKeys.ApplicationIdUri] = applicationIdUri;
|
|
97
|
+
}
|
|
98
|
+
if (includeBackend) {
|
|
99
|
+
localEnvs[constants_1.LocalEnvBackendKeys.ApiEndpoint] = localFuncEndpoint;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
// TODO: This is to load .env.teamsfx.local for each component. Remove this after fully supporting custom local debug.
|
|
103
|
+
try {
|
|
104
|
+
const localEnvProvider = new localEnvProvider_1.LocalEnvProvider(projectPath);
|
|
105
|
+
if (includeFrontend) {
|
|
106
|
+
const customEnvs = (await localEnvProvider.loadFrontendLocalEnvs(includeBackend, includeAuth))
|
|
107
|
+
.customizedLocalEnvs;
|
|
108
|
+
appendEnvWithPrefix(customEnvs, localEnvs, "FRONTEND_");
|
|
109
|
+
}
|
|
110
|
+
if (includeBackend) {
|
|
111
|
+
const customEnvs = (await localEnvProvider.loadBackendLocalEnvs()).customizedLocalEnvs;
|
|
112
|
+
appendEnvWithPrefix(customEnvs, localEnvs, "BACKEND_");
|
|
113
|
+
}
|
|
114
|
+
if (includeBot) {
|
|
115
|
+
const customEnvs = (await localEnvProvider.loadBotLocalEnvs(false)).customizedLocalEnvs;
|
|
116
|
+
appendEnvWithPrefix(customEnvs, localEnvs, "BOT_");
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
logger === null || logger === void 0 ? void 0 : logger.error(`Cannot load .env.teamsfx.local. ${error}`);
|
|
121
|
+
}
|
|
122
|
+
return localEnvs;
|
|
123
|
+
}
|
|
124
|
+
exports.convertToLocalEnvs = convertToLocalEnvs;
|
|
125
|
+
//# sourceMappingURL=localSettingsHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/localSettingsHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface NpmInstallLogInfo {
|
|
2
|
+
logFile: string;
|
|
3
|
+
timestamp: Date;
|
|
4
|
+
nodeVersion: string | undefined;
|
|
5
|
+
npmVersion: string | undefined;
|
|
6
|
+
cwd: string | undefined;
|
|
7
|
+
exitCode: number | undefined;
|
|
8
|
+
errorMessage: Array<string> | undefined;
|
|
9
|
+
}
|
|
10
|
+
export declare function getNpmInstallLogInfo(): Promise<NpmInstallLogInfo | undefined>;
|
|
11
|
+
//# sourceMappingURL=npmLogHelper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npmLogHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/npmLogHelper.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CACzC;AA2BD,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwDnF"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.getNpmInstallLogInfo = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
8
|
+
const path = tslib_1.__importStar(require("path"));
|
|
9
|
+
const cpUtils_1 = require("../deps-checker/util/cpUtils");
|
|
10
|
+
async function getNpmCachePath() {
|
|
11
|
+
try {
|
|
12
|
+
const result = await cpUtils_1.cpUtils.executeCommand(undefined, undefined, undefined, "npm config get cache");
|
|
13
|
+
return result.trim();
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
async function getLatestNpmLogFile(npmLogPath) {
|
|
20
|
+
const files = await fs.readdir(npmLogPath);
|
|
21
|
+
if (files.length === 0) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
const latestNpmLogFile = files.reduce((previous, current, index, array) => {
|
|
25
|
+
return previous > current ? previous : current;
|
|
26
|
+
});
|
|
27
|
+
return path.join(npmLogPath, latestNpmLogFile);
|
|
28
|
+
}
|
|
29
|
+
async function getNpmInstallLogInfo() {
|
|
30
|
+
try {
|
|
31
|
+
const npmCachePath = await getNpmCachePath();
|
|
32
|
+
if (npmCachePath === undefined || !(await fs.pathExists(npmCachePath))) {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
const npmLogFolder = path.join(npmCachePath, "_logs");
|
|
36
|
+
if (!(await fs.pathExists(npmLogFolder))) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
const latestNpmLogFile = await getLatestNpmLogFile(npmLogFolder);
|
|
40
|
+
if (latestNpmLogFile === undefined) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
const latestNpmLogFileName = path.basename(latestNpmLogFile);
|
|
44
|
+
const str = latestNpmLogFileName.replace(/_/g, ":");
|
|
45
|
+
const timestamp = new Date(`${str.slice(0, 19)}.${str.slice(20, 24)}`);
|
|
46
|
+
const log = (await fs.readFile(latestNpmLogFile)).toString();
|
|
47
|
+
const nodePattern = /\d+\s+verbose\s+node\s+(v.*)/;
|
|
48
|
+
const nodeResult = log.match(nodePattern);
|
|
49
|
+
const nodeVersion = nodeResult ? nodeResult[1].trim() : undefined;
|
|
50
|
+
const npmPattern = /\d+\s+verbose\s+npm\s+(v.*)/;
|
|
51
|
+
const npmResult = log.match(npmPattern);
|
|
52
|
+
const npmVersion = npmResult ? npmResult[1].trim() : undefined;
|
|
53
|
+
const cwdPattern = /\d+\s+verbose\s+cwd\s+(.*)/;
|
|
54
|
+
const cwdResult = log.match(cwdPattern);
|
|
55
|
+
const cwd = cwdResult ? cwdResult[1].trim() : undefined;
|
|
56
|
+
const exitCodePattern = /\d+\s+verbose\s+exit\s+\[\s+(-?\d+),\s+.*]/;
|
|
57
|
+
const exitCodeResult = log.match(exitCodePattern);
|
|
58
|
+
const exitCode = exitCodeResult ? Number(exitCodeResult[1]) : undefined;
|
|
59
|
+
const errorPattern = /\d+\s+error\s+.*/g;
|
|
60
|
+
const errorResults = log.match(errorPattern);
|
|
61
|
+
const errorMessage = errorResults
|
|
62
|
+
? errorResults.map((value, index, array) => {
|
|
63
|
+
return value.trim();
|
|
64
|
+
})
|
|
65
|
+
: undefined;
|
|
66
|
+
const npmInstallLogInfo = {
|
|
67
|
+
logFile: latestNpmLogFile,
|
|
68
|
+
timestamp,
|
|
69
|
+
nodeVersion,
|
|
70
|
+
npmVersion,
|
|
71
|
+
cwd,
|
|
72
|
+
exitCode,
|
|
73
|
+
errorMessage,
|
|
74
|
+
};
|
|
75
|
+
return npmInstallLogInfo;
|
|
76
|
+
}
|
|
77
|
+
catch (_a) {
|
|
78
|
+
return undefined;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
exports.getNpmInstallLogInfo = getNpmInstallLogInfo;
|
|
82
|
+
//# sourceMappingURL=npmLogHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npmLogHelper.js","sourceRoot":"","sources":["../../../src/common/local/npmLogHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ProjectSettings } from "@microsoft/teamsfx-api";
|
|
2
|
+
export declare class ProjectSettingsHelper {
|
|
3
|
+
static isSpfx: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
4
|
+
static includeFrontend: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
5
|
+
static includeBackend: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
6
|
+
static includeBot: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
7
|
+
static includeAuth(projectSettings: ProjectSettings | undefined): boolean;
|
|
8
|
+
static isMigrateFromV1: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=projectSettingsHelper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGhF,qBAAa,qBAAqB;IAChC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAG1E;IAEJ,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGnF;IAEJ,OAAc,cAAc,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAGlF;IAEJ,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAG9E;WAEU,WAAW,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAWhF,OAAc,eAAe,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAClC;CACtD"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.ProjectSettingsHelper = void 0;
|
|
6
|
+
const constants_1 = require("../constants");
|
|
7
|
+
class ProjectSettingsHelper {
|
|
8
|
+
static includeAuth(projectSettings) {
|
|
9
|
+
var _a;
|
|
10
|
+
const selectedPlugins = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
|
|
11
|
+
const includeAad = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.some((pluginName) => pluginName === constants_1.ResourcePlugins.Aad);
|
|
12
|
+
const includeSimpleAuth = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.some((pluginName) => pluginName === constants_1.ResourcePlugins.SimpleAuth);
|
|
13
|
+
return includeAad && (!this.includeFrontend(projectSettings) || includeSimpleAuth);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.ProjectSettingsHelper = ProjectSettingsHelper;
|
|
17
|
+
ProjectSettingsHelper.isSpfx = (projectSettings) => {
|
|
18
|
+
var _a, _b;
|
|
19
|
+
return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.SPFx));
|
|
20
|
+
};
|
|
21
|
+
ProjectSettingsHelper.includeFrontend = (projectSettings) => {
|
|
22
|
+
var _a, _b;
|
|
23
|
+
return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.FrontendHosting));
|
|
24
|
+
};
|
|
25
|
+
ProjectSettingsHelper.includeBackend = (projectSettings) => {
|
|
26
|
+
var _a, _b;
|
|
27
|
+
return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.Function));
|
|
28
|
+
};
|
|
29
|
+
ProjectSettingsHelper.includeBot = (projectSettings) => {
|
|
30
|
+
var _a, _b;
|
|
31
|
+
return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.some((pluginName) => pluginName === constants_1.ResourcePlugins.Bot));
|
|
32
|
+
};
|
|
33
|
+
ProjectSettingsHelper.isMigrateFromV1 = (projectSettings) => { var _a; return !!((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.migrateFromV1); };
|
|
34
|
+
//# sourceMappingURL=projectSettingsHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,4CAA+C;AAE/C,MAAa,qBAAqB;IAqBzB,MAAM,CAAC,WAAW,CAAC,eAA4C;;QACpE,MAAM,eAAe,GAAG,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAChF,qBAAqB,CAAC;QAC1B,MAAM,UAAU,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,GAAG,CAAC,CAAC;QAC7F,MAAM,iBAAiB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAC7C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,UAAU,CAC1D,CAAC;QAEF,OAAO,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,iBAAiB,CAAC,CAAC;IACrF,CAAC;;AA9BH,sDAkCC;AAjCe,4BAAM,GAAG,CAAC,eAA4C,EAAW,EAAE;;IAC/E,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,IAAI,CACpD,CAAA,CAAA;CAAA,CAAC;AAEU,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACxF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,eAAe,CAC/D,CAAA,CAAA;CAAA,CAAC;AAEU,oCAAc,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACvF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,QAAQ,CACxD,CAAA,CAAA;CAAA,CAAC;AAEU,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACnF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,IAAI,CACzF,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,2BAAe,CAAC,GAAG,CACnD,CAAA,CAAA;CAAA,CAAC;AAaU,qCAAe,GAAG,CAAC,eAA4C,EAAW,EAAE,WACxF,OAAA,CAAC,CAAC,CAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,0CAAE,aAAa,CAAA,CAAA,EAAA,CAAC"}
|
|
@@ -4,15 +4,15 @@ export declare class LocalSettingsProvider {
|
|
|
4
4
|
readonly localSettingsFilePath: string;
|
|
5
5
|
constructor(workspaceFolder: string);
|
|
6
6
|
init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): LocalSettings;
|
|
7
|
-
initV2(includeFrontend: boolean, includeBackend: boolean,
|
|
8
|
-
|
|
7
|
+
initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): Json;
|
|
8
|
+
incrementalInitV2(localSettingsJson: Json, addBackaned: boolean, addBot: boolean, addFrontend: boolean): Json;
|
|
9
9
|
load(cryptoProvider?: CryptoProvider): Promise<LocalSettings | undefined>;
|
|
10
10
|
loadV2(cryptoProvider?: CryptoProvider): Promise<Json | undefined>;
|
|
11
11
|
private decryptLocalSettings;
|
|
12
12
|
save(localSettings: LocalSettings, cryptoProvider?: CryptoProvider): Promise<void>;
|
|
13
13
|
saveJson(localSettingsJson: Json, cryptoProvider?: CryptoProvider): Promise<Json>;
|
|
14
14
|
private convertToLocalSettings;
|
|
15
|
-
|
|
15
|
+
convertToLocalSettingsJson(localSettings: LocalSettings): Json;
|
|
16
16
|
initSimpleAuth(): ConfigMap;
|
|
17
17
|
initFrontend(): ConfigMap;
|
|
18
18
|
initBackend(): ConfigMap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAUhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,GACpB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,GACpB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAc/E,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,cAAc,IAAI,SAAS;IAW3B,YAAY,IAAI,SAAS;IAazB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CAarB"}
|
|
@@ -7,14 +7,11 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
9
|
const localSettingsConstants_1 = require("./localSettingsConstants");
|
|
10
|
-
const tools_1 = require("./tools");
|
|
11
10
|
exports.localSettingsFileName = "localSettings.json";
|
|
12
11
|
const crypto = "crypto";
|
|
13
12
|
class LocalSettingsProvider {
|
|
14
13
|
constructor(workspaceFolder) {
|
|
15
|
-
this.localSettingsFilePath =
|
|
16
|
-
? `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/${exports.localSettingsFileName}`
|
|
17
|
-
: `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${exports.localSettingsFileName}`;
|
|
14
|
+
this.localSettingsFilePath = `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/${exports.localSettingsFileName}`;
|
|
18
15
|
}
|
|
19
16
|
init(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false) {
|
|
20
17
|
// initialize Teams app related config for local debug.
|
|
@@ -41,29 +38,32 @@ class LocalSettingsProvider {
|
|
|
41
38
|
}
|
|
42
39
|
return localSettings;
|
|
43
40
|
}
|
|
44
|
-
initV2(includeFrontend, includeBackend,
|
|
41
|
+
initV2(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false) {
|
|
45
42
|
const localSettings = {
|
|
46
43
|
teamsApp: {
|
|
47
44
|
[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId]: "",
|
|
48
45
|
[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TeamsAppId]: "",
|
|
49
46
|
},
|
|
50
47
|
};
|
|
48
|
+
if (!migrateFromV1) {
|
|
49
|
+
localSettings.auth = this.initSimpleAuth().toJSON();
|
|
50
|
+
}
|
|
51
51
|
// initialize frontend and simple auth local settings.
|
|
52
52
|
if (includeFrontend) {
|
|
53
53
|
localSettings.frontend = this.initFrontend().toJSON();
|
|
54
|
-
localSettings.auth = this.initSimpleAuth().toJSON();
|
|
55
54
|
}
|
|
56
55
|
// initialize backend local settings.
|
|
57
56
|
if (includeBackend) {
|
|
58
57
|
localSettings.backend = this.initBackend().toJSON();
|
|
59
58
|
}
|
|
60
59
|
// initialize bot local settings.
|
|
61
|
-
if (
|
|
60
|
+
if (includeBotOrMessageExtension) {
|
|
62
61
|
localSettings.bot = this.initBot().toJSON();
|
|
63
62
|
}
|
|
64
63
|
return localSettings;
|
|
65
64
|
}
|
|
66
|
-
|
|
65
|
+
incrementalInitV2(localSettingsJson, addBackaned, addBot, addFrontend) {
|
|
66
|
+
const localSettings = this.convertToLocalSettings(localSettingsJson);
|
|
67
67
|
if (!localSettings.backend && addBackaned) {
|
|
68
68
|
localSettings.backend = this.initBackend();
|
|
69
69
|
}
|
|
@@ -73,7 +73,7 @@ class LocalSettingsProvider {
|
|
|
73
73
|
if (!localSettings.frontend && addFrontend) {
|
|
74
74
|
localSettings.frontend = this.initFrontend();
|
|
75
75
|
}
|
|
76
|
-
return localSettings;
|
|
76
|
+
return this.convertToLocalSettingsJson(localSettings);
|
|
77
77
|
}
|
|
78
78
|
async load(cryptoProvider) {
|
|
79
79
|
if (await fs.pathExists(this.localSettingsFilePath)) {
|
|
@@ -182,8 +182,10 @@ class LocalSettingsProvider {
|
|
|
182
182
|
var _a, _b;
|
|
183
183
|
const localSettingsJson = {
|
|
184
184
|
teamsApp: (_a = localSettings.teamsApp) === null || _a === void 0 ? void 0 : _a.toJSON(),
|
|
185
|
-
auth: (_b = localSettings.auth) === null || _b === void 0 ? void 0 : _b.toJSON(),
|
|
186
185
|
};
|
|
186
|
+
if (localSettings.auth) {
|
|
187
|
+
localSettingsJson["auth"] = (_b = localSettings.auth) === null || _b === void 0 ? void 0 : _b.toJSON();
|
|
188
|
+
}
|
|
187
189
|
if (localSettings.frontend) {
|
|
188
190
|
localSettingsJson["frontend"] = localSettings.frontend.toJSON();
|
|
189
191
|
}
|