@microsoft/teamsfx-core 0.7.0 → 0.7.1-alpha.5e8f6dea.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/constants.d.ts +5 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +6 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/fileUtils.d.ts.map +1 -1
- package/build/common/fileUtils.js +12 -6
- package/build/common/fileUtils.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts +4 -2
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +32 -1
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/templates.d.ts.map +1 -1
- package/build/common/templates.js +9 -9
- package/build/common/templates.js.map +1 -1
- package/build/common/templatesActions.d.ts +39 -0
- package/build/common/templatesActions.d.ts.map +1 -0
- package/build/common/templatesActions.js +120 -0
- package/build/common/templatesActions.js.map +1 -0
- package/build/common/templatesUtils.d.ts +14 -0
- package/build/common/templatesUtils.d.ts.map +1 -0
- package/build/common/templatesUtils.js +94 -0
- package/build/common/templatesUtils.js.map +1 -0
- package/build/common/tools.d.ts +12 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +52 -7
- package/build/common/tools.js.map +1 -1
- package/build/core/SolutionPluginContainer.d.ts +15 -0
- package/build/core/SolutionPluginContainer.d.ts.map +1 -0
- package/build/core/SolutionPluginContainer.js +54 -0
- package/build/core/SolutionPluginContainer.js.map +1 -0
- package/build/core/callback.d.ts +9 -0
- package/build/core/callback.d.ts.map +1 -0
- package/build/core/callback.js +33 -0
- package/build/core/callback.js.map +1 -0
- package/build/core/environment.d.ts +7 -3
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +68 -13
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +19 -2
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +72 -34
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +24 -12
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +604 -309
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +13 -6
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/contextInjector.d.ts +3 -0
- package/build/core/middleware/contextInjector.d.ts.map +1 -0
- package/build/core/middleware/{contextInjecter.js → contextInjector.js} +4 -4
- package/build/core/middleware/contextInjector.js.map +1 -0
- package/build/core/middleware/envInfoLoader.d.ts +8 -4
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +77 -40
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/envInfoWriter.d.ts +1 -1
- package/build/core/middleware/envInfoWriter.d.ts.map +1 -1
- package/build/core/middleware/envInfoWriter.js +30 -13
- package/build/core/middleware/envInfoWriter.js.map +1 -1
- package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +18 -8
- 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 +14 -5
- package/build/core/middleware/localSettingsWriter.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts +5 -0
- package/build/core/middleware/projectMigrator.d.ts.map +1 -0
- package/build/core/middleware/projectMigrator.js +382 -0
- package/build/core/middleware/projectMigrator.js.map +1 -0
- package/build/core/middleware/projectSettingsLoader.d.ts +2 -2
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +13 -9
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsWriter.js +6 -7
- 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 +15 -7
- package/build/core/middleware/projectUpgrader.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +25 -17
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/solutionLoader.d.ts +1 -2
- package/build/core/middleware/solutionLoader.d.ts.map +1 -1
- package/build/core/middleware/solutionLoader.js +24 -4
- package/build/core/middleware/solutionLoader.js.map +1 -1
- package/build/core/question.d.ts +2 -0
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +12 -1
- package/build/core/question.js.map +1 -1
- package/build/core/tools.d.ts +2 -2
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +15 -5
- package/build/core/tools.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/plugins/resource/aad/appStudio.js +1 -1
- package/build/plugins/resource/aad/appStudio.js.map +1 -1
- package/build/plugins/resource/aad/errors.d.ts.map +1 -1
- package/build/plugins/resource/aad/errors.js +1 -0
- package/build/plugins/resource/aad/errors.js.map +1 -1
- package/build/plugins/resource/aad/index.d.ts +1 -0
- package/build/plugins/resource/aad/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/index.js +2 -1
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +9 -10
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/aad/utils/telemetry.js +1 -1
- package/build/plugins/resource/aad/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/aad/v2/index.d.ts +7 -7
- package/build/plugins/resource/aad/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/v2/index.js +6 -6
- package/build/plugins/resource/aad/v2/index.js.map +1 -1
- package/build/plugins/resource/apim/config.d.ts +1 -0
- package/build/plugins/resource/apim/config.d.ts.map +1 -1
- package/build/plugins/resource/apim/config.js.map +1 -1
- package/build/plugins/resource/apim/constants.d.ts +3 -0
- package/build/plugins/resource/apim/constants.d.ts.map +1 -1
- package/build/plugins/resource/apim/constants.js +5 -1
- package/build/plugins/resource/apim/constants.js.map +1 -1
- package/build/plugins/resource/apim/factory.d.ts +2 -1
- package/build/plugins/resource/apim/factory.d.ts.map +1 -1
- package/build/plugins/resource/apim/factory.js +19 -8
- package/build/plugins/resource/apim/factory.js.map +1 -1
- package/build/plugins/resource/apim/index.d.ts +2 -0
- package/build/plugins/resource/apim/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/index.js +15 -8
- package/build/plugins/resource/apim/index.js.map +1 -1
- package/build/plugins/resource/apim/questions/vscodeQuestion.js +1 -1
- package/build/plugins/resource/apim/questions/vscodeQuestion.js.map +1 -1
- package/build/plugins/resource/apim/v2/index.d.ts +9 -11
- package/build/plugins/resource/apim/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/v2/index.js +25 -29
- package/build/plugins/resource/apim/v2/index.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +9 -8
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +6 -2
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +124 -13
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/errors.d.ts +4 -0
- package/build/plugins/resource/appstudio/errors.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/errors.js +8 -0
- package/build/plugins/resource/appstudio/errors.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts +1 -0
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +23 -5
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts +1 -0
- package/build/plugins/resource/appstudio/interfaces/IAppDefinition.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +2 -1
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +197 -68
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts +2 -1
- package/build/plugins/resource/appstudio/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/utils/telemetry.js +17 -12
- package/build/plugins/resource/appstudio/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.d.ts +10 -13
- package/build/plugins/resource/appstudio/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v2/index.js +25 -20
- package/build/plugins/resource/appstudio/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.js +2 -2
- package/build/plugins/resource/bot/appStudio/appStudio.js.map +1 -1
- package/build/plugins/resource/bot/configs/localDebugConfig.d.ts +1 -1
- package/build/plugins/resource/bot/configs/localDebugConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/localDebugConfig.js +3 -3
- package/build/plugins/resource/bot/configs/localDebugConfig.js.map +1 -1
- package/build/plugins/resource/bot/configs/provisionConfig.js +21 -20
- package/build/plugins/resource/bot/configs/provisionConfig.js.map +1 -1
- package/build/plugins/resource/bot/configs/scaffoldConfig.d.ts +1 -3
- package/build/plugins/resource/bot/configs/scaffoldConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/scaffoldConfig.js +9 -10
- package/build/plugins/resource/bot/configs/scaffoldConfig.js.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js +5 -5
- package/build/plugins/resource/bot/configs/teamsBotConfig.js.map +1 -1
- package/build/plugins/resource/bot/constants.d.ts +0 -2
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +2 -14
- package/build/plugins/resource/bot/constants.js.map +1 -1
- package/build/plugins/resource/bot/index.d.ts +2 -3
- package/build/plugins/resource/bot/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/index.js +1 -7
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts +1 -4
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +21 -80
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/resources/messages.d.ts +0 -1
- package/build/plugins/resource/bot/resources/messages.d.ts.map +1 -1
- package/build/plugins/resource/bot/resources/messages.js +0 -1
- package/build/plugins/resource/bot/resources/messages.js.map +1 -1
- package/build/plugins/resource/bot/resources/strings.d.ts +1 -1
- package/build/plugins/resource/bot/resources/strings.d.ts.map +1 -1
- package/build/plugins/resource/bot/resources/strings.js +1 -1
- package/build/plugins/resource/bot/resources/strings.js.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.js +1 -1
- package/build/plugins/resource/bot/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +9 -13
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +7 -7
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/configs.d.ts +7 -2
- package/build/plugins/resource/frontend/configs.d.ts.map +1 -1
- package/build/plugins/resource/frontend/configs.js +49 -29
- package/build/plugins/resource/frontend/configs.js.map +1 -1
- package/build/plugins/resource/frontend/constants.d.ts +3 -2
- package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/constants.js +4 -3
- package/build/plugins/resource/frontend/constants.js.map +1 -1
- package/build/plugins/resource/frontend/index.d.ts +1 -1
- package/build/plugins/resource/frontend/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/index.js +6 -5
- package/build/plugins/resource/frontend/index.js.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.js +1 -0
- package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts +4 -1
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +32 -32
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.js +5 -2
- package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
- package/build/plugins/resource/frontend/utils/telemetry-helper.js +1 -1
- package/build/plugins/resource/frontend/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts +6 -9
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js +5 -2
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/function/constants.d.ts +2 -6
- package/build/plugins/resource/function/constants.d.ts.map +1 -1
- package/build/plugins/resource/function/constants.js +3 -8
- package/build/plugins/resource/function/constants.js.map +1 -1
- package/build/plugins/resource/function/enums.d.ts +2 -0
- package/build/plugins/resource/function/enums.d.ts.map +1 -1
- package/build/plugins/resource/function/enums.js +2 -0
- package/build/plugins/resource/function/enums.js.map +1 -1
- package/build/plugins/resource/function/index.d.ts +1 -0
- package/build/plugins/resource/function/index.d.ts.map +1 -1
- package/build/plugins/resource/function/index.js +1 -0
- package/build/plugins/resource/function/index.js.map +1 -1
- package/build/plugins/resource/function/ops/deploy.d.ts +1 -1
- package/build/plugins/resource/function/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/deploy.js +13 -5
- package/build/plugins/resource/function/ops/deploy.js.map +1 -1
- package/build/plugins/resource/function/ops/scaffold.d.ts +4 -7
- package/build/plugins/resource/function/ops/scaffold.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/scaffold.js +42 -40
- package/build/plugins/resource/function/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/function/plugin.d.ts +4 -0
- package/build/plugins/resource/function/plugin.d.ts.map +1 -1
- package/build/plugins/resource/function/plugin.js +57 -41
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/resources/errors.d.ts +2 -5
- package/build/plugins/resource/function/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/function/resources/errors.js +5 -13
- package/build/plugins/resource/function/resources/errors.js.map +1 -1
- package/build/plugins/resource/function/resources/message.d.ts +1 -0
- package/build/plugins/resource/function/resources/message.d.ts.map +1 -1
- package/build/plugins/resource/function/resources/message.js +1 -0
- package/build/plugins/resource/function/resources/message.js.map +1 -1
- package/build/plugins/resource/function/utils/telemetry-helper.js +1 -1
- package/build/plugins/resource/function/utils/telemetry-helper.js.map +1 -1
- package/build/plugins/resource/function/v2/index.d.ts +8 -11
- package/build/plugins/resource/function/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v2/index.js +9 -17
- package/build/plugins/resource/function/v2/index.js.map +1 -1
- package/build/plugins/resource/identity/index.d.ts +1 -0
- package/build/plugins/resource/identity/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/index.js +7 -9
- package/build/plugins/resource/identity/index.js.map +1 -1
- package/build/plugins/resource/identity/utils/contextUtils.js +1 -1
- package/build/plugins/resource/identity/utils/contextUtils.js.map +1 -1
- package/build/plugins/resource/identity/utils/telemetryUtil.d.ts.map +1 -1
- package/build/plugins/resource/identity/utils/telemetryUtil.js +1 -1
- package/build/plugins/resource/identity/utils/telemetryUtil.js.map +1 -1
- package/build/plugins/resource/identity/v2/index.d.ts +3 -3
- package/build/plugins/resource/identity/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/identity/v2/index.js +2 -2
- package/build/plugins/resource/identity/v2/index.js.map +1 -1
- package/build/plugins/resource/localdebug/constants.d.ts +4 -0
- package/build/plugins/resource/localdebug/constants.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/constants.js +6 -1
- package/build/plugins/resource/localdebug/constants.js.map +1 -1
- package/build/plugins/resource/localdebug/index.d.ts +1 -0
- package/build/plugins/resource/localdebug/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/index.js +12 -6
- package/build/plugins/resource/localdebug/index.js.map +1 -1
- package/build/plugins/resource/localdebug/launch.d.ts +1 -0
- package/build/plugins/resource/localdebug/launch.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/launch.js +66 -1
- package/build/plugins/resource/localdebug/launch.js.map +1 -1
- package/build/plugins/resource/localdebug/legacyPlugin.js +4 -4
- package/build/plugins/resource/localdebug/legacyPlugin.js.map +1 -1
- package/build/plugins/resource/localdebug/tasks.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/tasks.js +12 -2
- package/build/plugins/resource/localdebug/tasks.js.map +1 -1
- package/build/plugins/resource/localdebug/util/telemetry.js +1 -1
- package/build/plugins/resource/localdebug/util/telemetry.js.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.d.ts +6 -8
- package/build/plugins/resource/localdebug/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/localdebug/v2/index.js +2 -2
- package/build/plugins/resource/localdebug/v2/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/index.d.ts +1 -0
- package/build/plugins/resource/simpleauth/index.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/index.js +1 -0
- package/build/plugins/resource/simpleauth/index.js.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/plugin.js +1 -6
- package/build/plugins/resource/simpleauth/plugin.js.map +1 -1
- package/build/plugins/resource/simpleauth/utils/common.js +1 -1
- package/build/plugins/resource/simpleauth/utils/common.js.map +1 -1
- package/build/plugins/resource/simpleauth/utils/telemetry.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/utils/telemetry.js +2 -1
- package/build/plugins/resource/simpleauth/utils/telemetry.js.map +1 -1
- package/build/plugins/resource/simpleauth/v2/index.d.ts +4 -4
- package/build/plugins/resource/simpleauth/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/simpleauth/v2/index.js.map +1 -1
- package/build/plugins/resource/spfx/index.d.ts +1 -0
- package/build/plugins/resource/spfx/index.d.ts.map +1 -1
- package/build/plugins/resource/spfx/index.js +1 -0
- package/build/plugins/resource/spfx/index.js.map +1 -1
- package/build/plugins/resource/spfx/v2/index.d.ts +4 -8
- package/build/plugins/resource/spfx/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/spfx/v2/index.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/errors.d.ts +4 -0
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +4 -0
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/index.d.ts +1 -0
- package/build/plugins/resource/sql/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/index.js +1 -0
- package/build/plugins/resource/sql/index.js.map +1 -1
- package/build/plugins/resource/sql/plugin.d.ts +4 -0
- package/build/plugins/resource/sql/plugin.d.ts.map +1 -1
- package/build/plugins/resource/sql/plugin.js +68 -69
- package/build/plugins/resource/sql/plugin.js.map +1 -1
- package/build/plugins/resource/sql/utils/contextUtils.js +1 -1
- package/build/plugins/resource/sql/utils/contextUtils.js.map +1 -1
- package/build/plugins/resource/sql/utils/telemetryUtils.d.ts.map +1 -1
- package/build/plugins/resource/sql/utils/telemetryUtils.js +2 -1
- package/build/plugins/resource/sql/utils/telemetryUtils.js.map +1 -1
- package/build/plugins/resource/sql/v2/index.d.ts +5 -4
- package/build/plugins/resource/sql/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/sql/v2/index.js +18 -16
- package/build/plugins/resource/sql/v2/index.js.map +1 -1
- package/build/plugins/resource/utils4v2.d.ts +16 -14
- package/build/plugins/resource/utils4v2.d.ts.map +1 -1
- package/build/plugins/resource/utils4v2.js +127 -92
- package/build/plugins/resource/utils4v2.js.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js +4 -2
- package/build/plugins/solution/fx-solution/ResourcePluginContainer.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts +11 -0
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +118 -40
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +2 -2
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +120 -47
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +16 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +15 -1
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/executor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/executor.js +39 -21
- package/build/plugins/solution/fx-solution/executor.js.map +1 -1
- package/build/plugins/solution/fx-solution/index.d.ts +2 -0
- package/build/plugins/solution/fx-solution/index.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/index.js +2 -0
- package/build/plugins/solution/fx-solution/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +2 -1
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +18 -1
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts +3 -6
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +406 -379
- package/build/plugins/solution/fx-solution/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/utils/util.js +1 -1
- package/build/plugins/solution/fx-solution/utils/util.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.d.ts +3 -0
- package/build/plugins/solution/fx-solution/v2/adaptor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/adaptor.js +37 -3
- package/build/plugins/solution/fx-solution/v2/adaptor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/createEnv.d.ts +3 -0
- package/build/plugins/solution/fx-solution/v2/createEnv.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v2/createEnv.js +28 -0
- package/build/plugins/solution/fx-solution/v2/createEnv.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/deploy.d.ts +2 -4
- package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +19 -14
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +20 -4
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executor.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/executor.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executor.js +27 -3
- package/build/plugins/solution/fx-solution/v2/executor.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js +8 -2
- package/build/plugins/solution/fx-solution/v2/generateResourceTemplate.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts +8 -0
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +393 -0
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/package.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/package.js +12 -2
- package/build/plugins/solution/fx-solution/v2/package.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts +4 -0
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v2/provision.js +153 -0
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts +3 -0
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +73 -0
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/publish.d.ts +2 -2
- package/build/plugins/solution/fx-solution/v2/publish.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +11 -11
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts +3 -7
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +21 -6
- package/build/plugins/solution/fx-solution/v2/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts +18 -0
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -0
- package/build/plugins/solution/fx-solution/v2/solution.js +38 -0
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -0
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +11 -9
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +81 -1
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +8 -5
- package/resource/strings.json +2 -1
- package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep +0 -4
- package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +0 -6
- package/templates/plugins/resource/bot/bicep/module.template.bicep +0 -4
- package/templates/plugins/resource/bot/bicep/output.template.bicep +0 -2
- package/templates/plugins/resource/bot/bicep/param.template.bicep +0 -2
- package/templates/plugins/resource/bot/bot-msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/frontend/bicep/frontendHosting.bicep +1 -1
- package/templates/plugins/resource/frontend/bicep/output.template.bicep +1 -1
- package/templates/plugins/resource/frontend/tab.js.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.ts.default.zip +0 -0
- package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +1 -3
- package/templates/plugins/resource/function/bicep/output.template.bicep +1 -3
- package/templates/plugins/resource/function/function-base.js.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/spfx/solution/manifest_multi_env.json +62 -0
- package/build/core/loader.d.ts +0 -11
- package/build/core/loader.d.ts.map +0 -1
- package/build/core/loader.js +0 -17
- package/build/core/loader.js.map +0 -1
- package/build/core/middleware/contextInjecter.d.ts +0 -3
- package/build/core/middleware/contextInjecter.d.ts.map +0 -1
- package/build/core/middleware/contextInjecter.js.map +0 -1
- package/build/plugins/resource/bot/enums/wayToRegisterBot.d.ts +0 -5
- package/build/plugins/resource/bot/enums/wayToRegisterBot.d.ts.map +0 -1
- package/build/plugins/resource/bot/enums/wayToRegisterBot.js +0 -11
- package/build/plugins/resource/bot/enums/wayToRegisterBot.js.map +0 -1
- package/build/plugins/resource/bot/questions.d.ts +0 -4
- package/build/plugins/resource/bot/questions.d.ts.map +0 -1
- package/build/plugins/resource/bot/questions.js +0 -65
- package/build/plugins/resource/bot/questions.js.map +0 -1
- package/build/plugins/resource/function/utils/templates-fetch.d.ts +0 -10
- package/build/plugins/resource/function/utils/templates-fetch.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/templates-fetch.js +0 -107
- package/build/plugins/resource/function/utils/templates-fetch.js.map +0 -1
|
@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.LocalSettingsLoaderMW = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
-
const __1 = require("..");
|
|
9
|
-
const localSettingsProvider_1 = require("../../common/localSettingsProvider");
|
|
10
8
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
9
|
+
const __1 = require("..");
|
|
11
10
|
const common_1 = require("../../common");
|
|
12
|
-
const
|
|
11
|
+
const localSettingsProvider_1 = require("../../common/localSettingsProvider");
|
|
13
12
|
const constants_1 = require("../../plugins/solution/fx-solution/constants");
|
|
13
|
+
const ResourcePluginContainer_1 = require("../../plugins/solution/fx-solution/ResourcePluginContainer");
|
|
14
14
|
const LocalSettingsLoaderMW = async (ctx, next) => {
|
|
15
15
|
var _a;
|
|
16
|
-
if (common_1.isMultiEnvEnabled()
|
|
16
|
+
if (common_1.isMultiEnvEnabled()) {
|
|
17
17
|
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
18
18
|
if (!inputs.projectPath) {
|
|
19
19
|
ctx.result = teamsfx_api_1.err(__1.NoProjectOpenedError());
|
|
@@ -30,11 +30,21 @@ const LocalSettingsLoaderMW = async (ctx, next) => {
|
|
|
30
30
|
const hasBackend = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.some((plugin) => plugin.name === constants_1.PluginNames.FUNC);
|
|
31
31
|
const hasBot = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.some((plugin) => plugin.name === constants_1.PluginNames.BOT);
|
|
32
32
|
const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(inputs.projectPath);
|
|
33
|
-
if (
|
|
34
|
-
|
|
33
|
+
if (__1.isV2()) {
|
|
34
|
+
if (await fs.pathExists(localSettingsProvider.localSettingsFilePath)) {
|
|
35
|
+
ctx.localSettings = await localSettingsProvider.loadV2();
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
ctx.localSettings = localSettingsProvider.initV2(hasFrontend, hasBackend, hasBot);
|
|
39
|
+
}
|
|
35
40
|
}
|
|
36
|
-
else {
|
|
37
|
-
|
|
41
|
+
else if (ctx.solutionContext) {
|
|
42
|
+
if (await fs.pathExists(localSettingsProvider.localSettingsFilePath)) {
|
|
43
|
+
ctx.solutionContext.localSettings = await localSettingsProvider.load();
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
ctx.solutionContext.localSettings = localSettingsProvider.init(hasFrontend, hasBackend, hasBot);
|
|
47
|
+
}
|
|
38
48
|
}
|
|
39
49
|
}
|
|
40
50
|
await next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAAoF;AACpF,
|
|
1
|
+
{"version":3,"file":"localSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAAoF;AACpF,qDAA+B;AAC/B,0BAAoF;AACpF,yCAAiD;AACjD,8EAA2E;AAC3E,4EAA2E;AAC3E,wGAAyG;AAElG,MAAM,qBAAqB,GAAe,KAAK,EACpD,GAAoB,EACpB,IAAkB,EAClB,EAAE;;IACF,IAAI,0BAAiB,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,wBAAoB,EAAE,CAAC,CAAC;YACzC,OAAO;SACR;QAED,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,EAAE;YACrB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,qBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YACxD,OAAO;SACR;QAED,MAAM,gBAAgB,GAAG,MAAA,GAAG,CAAC,eAAe,0CAAE,gBAAyC,CAAC;QACxF,MAAM,eAAe,GAAa,qDAA2B,CAAC,gBAAgB,CAAC,CAAC;QAEhF,MAAM,WAAW,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,uBAAW,CAAC,EAAE,CAAC,CAAC;QACtF,MAAM,UAAU,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,uBAAW,CAAC,IAAI,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,uBAAW,CAAC,GAAG,CAAC,CAAC;QAElF,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAI,QAAI,EAAE,EAAE;YACV,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,EAAE;gBACpE,GAAG,CAAC,aAAa,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,CAAC;aAC1D;iBAAM;gBACL,GAAG,CAAC,aAAa,GAAG,qBAAqB,CAAC,MAAM,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;aACnF;SACF;aAAM,IAAI,GAAG,CAAC,eAAe,EAAE;YAC9B,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,EAAE;gBACpE,GAAG,CAAC,eAAe,CAAC,aAAa,GAAG,MAAM,qBAAqB,CAAC,IAAI,EAAE,CAAC;aACxE;iBAAM;gBACL,GAAG,CAAC,eAAe,CAAC,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAC5D,WAAW,EACX,UAAU,EACV,MAAM,CACP,CAAC;aACH;SACF;KACF;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AA7CW,QAAA,qBAAqB,yBA6ChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsWriter.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAM7D;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"localSettingsWriter.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAM7D;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,UAoCnC,CAAC"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.LocalSettingsWriterMW = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
+
const __1 = require("..");
|
|
7
8
|
const common_1 = require("../../common");
|
|
8
9
|
const localSettingsProvider_1 = require("../../common/localSettingsProvider");
|
|
9
10
|
/**
|
|
@@ -21,12 +22,20 @@ const LocalSettingsWriterMW = async (ctx, next) => {
|
|
|
21
22
|
inputs.ignoreConfigPersist === true ||
|
|
22
23
|
teamsfx_api_1.StaticPlatforms.includes(inputs.platform))
|
|
23
24
|
return;
|
|
24
|
-
const solutionContext = ctx.solutionContext;
|
|
25
|
-
if (solutionContext === undefined || solutionContext.localSettings === undefined)
|
|
26
|
-
return;
|
|
27
|
-
// persistent localSettings.json.
|
|
28
25
|
const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(inputs.projectPath);
|
|
29
|
-
|
|
26
|
+
if (__1.isV2()) {
|
|
27
|
+
if (ctx.localSettings === undefined)
|
|
28
|
+
return;
|
|
29
|
+
// persistent localSettings.json.
|
|
30
|
+
await localSettingsProvider.save(ctx.localSettings);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
const solutionContext = ctx.solutionContext;
|
|
34
|
+
if (solutionContext === undefined || solutionContext.localSettings === undefined)
|
|
35
|
+
return;
|
|
36
|
+
// persistent localSettings.json.
|
|
37
|
+
await localSettingsProvider.save(solutionContext.localSettings);
|
|
38
|
+
}
|
|
30
39
|
const core = ctx.self;
|
|
31
40
|
core.tools.logProvider.debug(`[core] persist local settings profile: ${localSettingsProvider.localSettingsFilePath}`);
|
|
32
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;
|
|
1
|
+
{"version":3,"file":"localSettingsWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;AACjE,0BAAmD;AACnD,yCAAiD;AACjD,8EAA2E;AAE3E;;GAEG;AACI,MAAM,qBAAqB,GAAe,KAAK,EACpD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,IAAI;QACF,MAAM,IAAI,EAAE,CAAC;KACd;YAAS;QACR,IAAI,0BAAiB,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3F,IACE,CAAC,MAAM,CAAC,WAAW;gBACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;gBACnC,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAEzC,OAAO;YAET,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAE5E,IAAI,QAAI,EAAE,EAAE;gBACV,IAAI,GAAG,CAAC,aAAa,KAAK,SAAS;oBAAE,OAAO;gBAC5C,iCAAiC;gBACjC,MAAM,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;aACrD;iBAAM;gBACL,MAAM,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;gBAC5C,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,CAAC,aAAa,KAAK,SAAS;oBAAE,OAAO;gBACzF,iCAAiC;gBACjC,MAAM,qBAAqB,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;aACjE;YAED,MAAM,IAAI,GAAG,GAAG,CAAC,IAAc,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAC1B,0CAA0C,qBAAqB,CAAC,qBAAqB,EAAE,CACxF,CAAC;SACH;KACF;AACH,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectMigrator.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigrator.ts"],"names":[],"mappings":"AAiBA,OAAO,EACL,eAAe,EAOhB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAyCjE,eAAO,MAAM,iBAAiB,EAAE,UAgB/B,CAAC;AA+QF,wBAAsB,UAAU,CAAC,GAAG,EAAE,eAAe,iBAGpD"}
|
|
@@ -0,0 +1,382 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.migrateArm = exports.ProjectMigratorMW = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const __1 = require("../..");
|
|
9
|
+
const localSettingsProvider_1 = require("../../common/localSettingsProvider");
|
|
10
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
11
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
12
|
+
const fileUtils_1 = require("../../common/fileUtils");
|
|
13
|
+
const constants_1 = require("../../plugins/solution/fx-solution/constants");
|
|
14
|
+
const tools_1 = require("../../common/tools");
|
|
15
|
+
const projectSettingsLoader_1 = require("./projectSettingsLoader");
|
|
16
|
+
const arm_1 = require("../../plugins/solution/fx-solution/arm");
|
|
17
|
+
const envInfoLoader_1 = require("./envInfoLoader");
|
|
18
|
+
const constants_2 = require("../../common/constants");
|
|
19
|
+
const ResourcePluginContainer_1 = require("../../plugins/solution/fx-solution/ResourcePluginContainer");
|
|
20
|
+
const constants_3 = require("../../plugins/resource/localdebug/constants");
|
|
21
|
+
const programmingLanguage = "programmingLanguage";
|
|
22
|
+
const defaultFunctionName = "defaultFunctionName";
|
|
23
|
+
const learnMoreText = "Learn More";
|
|
24
|
+
const migrationGuideUrl = "https://aka.ms/teamsfx-migration-guide";
|
|
25
|
+
class EnvConfigName {
|
|
26
|
+
}
|
|
27
|
+
EnvConfigName.StorageName = "storageName";
|
|
28
|
+
EnvConfigName.IdentityName = "identity";
|
|
29
|
+
EnvConfigName.SqlEndpoint = "sqlEndpoint";
|
|
30
|
+
EnvConfigName.SqlDataBase = "databaseName";
|
|
31
|
+
EnvConfigName.SkuName = "skuName";
|
|
32
|
+
EnvConfigName.AppServicePlanName = "appServicePlanName";
|
|
33
|
+
EnvConfigName.StorageAccountName = "storageAccountName";
|
|
34
|
+
EnvConfigName.FuncAppName = "functionAppName";
|
|
35
|
+
class ArmParameters {
|
|
36
|
+
}
|
|
37
|
+
ArmParameters.FEStorageName = "frontendHosting_storageName";
|
|
38
|
+
ArmParameters.IdentityName = "identity_managedIdentityName";
|
|
39
|
+
ArmParameters.SQLServer = "azureSql_serverName";
|
|
40
|
+
ArmParameters.SQLDatabase = "azureSql_databaseName";
|
|
41
|
+
ArmParameters.SimpleAuthSku = "simpleAuth_sku";
|
|
42
|
+
ArmParameters.functionServerName = "function_serverfarmsName";
|
|
43
|
+
ArmParameters.functionStorageName = "function_storageName";
|
|
44
|
+
ArmParameters.functionAppName = "function_webappName";
|
|
45
|
+
const ProjectMigratorMW = async (ctx, next) => {
|
|
46
|
+
if (await needMigrateToArmAndMultiEnv(ctx)) {
|
|
47
|
+
const core = ctx.self;
|
|
48
|
+
const res = await core.tools.ui.showMessage("warn", tools_1.getStrings().solution.MigrationToArmAndMultiEnvMessage, true, "OK");
|
|
49
|
+
const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
|
|
50
|
+
if (!answer || answer != "OK") {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
await migrateToArmAndMultiEnv(ctx);
|
|
54
|
+
}
|
|
55
|
+
await next();
|
|
56
|
+
};
|
|
57
|
+
exports.ProjectMigratorMW = ProjectMigratorMW;
|
|
58
|
+
async function migrateToArmAndMultiEnv(ctx) {
|
|
59
|
+
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
60
|
+
const projectPath = inputs.projectPath;
|
|
61
|
+
try {
|
|
62
|
+
await removeBotConfig(ctx);
|
|
63
|
+
await migrateMultiEnv(projectPath);
|
|
64
|
+
await migrateArm(ctx);
|
|
65
|
+
}
|
|
66
|
+
catch (err) {
|
|
67
|
+
await cleanup(projectPath);
|
|
68
|
+
throw err;
|
|
69
|
+
}
|
|
70
|
+
await removeOldProjectFiles(projectPath);
|
|
71
|
+
const core = ctx.self;
|
|
72
|
+
core.tools.ui
|
|
73
|
+
.showMessage("info", tools_1.getStrings().solution.MigrationToArmAndMultiEnvSuccessMessage, false, learnMoreText)
|
|
74
|
+
.then((result) => {
|
|
75
|
+
const userSelected = result.isOk() ? result.value : undefined;
|
|
76
|
+
if (userSelected === learnMoreText) {
|
|
77
|
+
core.tools.ui.openUrl(migrationGuideUrl);
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
async function migrateMultiEnv(projectPath) {
|
|
82
|
+
const { fx, fxConfig, templateAppPackage, fxPublishProfile } = await getMultiEnvFolders(projectPath);
|
|
83
|
+
const { hasFrontend, hasBackend, hasBot, hasProvision } = await queryProjectStatus(fx);
|
|
84
|
+
//localSettings.json
|
|
85
|
+
const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(projectPath);
|
|
86
|
+
await localSettingsProvider.save(localSettingsProvider.init(hasFrontend, hasBackend, hasBot));
|
|
87
|
+
//projectSettings.json
|
|
88
|
+
const projectSettings = path_1.default.join(fxConfig, teamsfx_api_1.ProjectSettingsFileName);
|
|
89
|
+
await fs_extra_1.default.copy(path_1.default.join(fx, "settings.json"), projectSettings);
|
|
90
|
+
await ensureProjectSettings(projectSettings, path_1.default.join(fx, "env.default.json"));
|
|
91
|
+
//config.dev.json
|
|
92
|
+
await fs_extra_1.default.writeFile(path_1.default.join(fxConfig, "config.dev.json"), JSON.stringify(getConfigDevJson(await getAppName(projectSettings)), null, 4));
|
|
93
|
+
// appPackage
|
|
94
|
+
await fs_extra_1.default.copy(path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName), templateAppPackage);
|
|
95
|
+
await fs_extra_1.default.rename(path_1.default.join(templateAppPackage, "manifest.source.json"), path_1.default.join(templateAppPackage, "manifest.template.json"));
|
|
96
|
+
await moveIconsToResourceFolder(templateAppPackage);
|
|
97
|
+
if (hasProvision) {
|
|
98
|
+
const devProfile = path_1.default.join(fxPublishProfile, "profile.dev.json");
|
|
99
|
+
const devUserData = path_1.default.join(fxPublishProfile, "dev.userdata");
|
|
100
|
+
await fs_extra_1.default.copy(path_1.default.join(fx, "new.env.default.json"), devProfile);
|
|
101
|
+
await fs_extra_1.default.copy(path_1.default.join(fx, "default.userdata"), devUserData);
|
|
102
|
+
await removeExpiredFields(devProfile, devUserData);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
async function moveIconsToResourceFolder(templateAppPackage) {
|
|
106
|
+
// see AppStudioPluginImpl.buildTeamsAppPackage()
|
|
107
|
+
const manifest = await fileUtils_1.readJson(path_1.default.join(templateAppPackage, "manifest.template.json"));
|
|
108
|
+
const hasColorIcon = manifest.icons.color && !manifest.icons.color.startsWith("https://");
|
|
109
|
+
const hasOutlineIcon = manifest.icons.outline && !manifest.icons.outline.startsWith("https://");
|
|
110
|
+
if (!hasColorIcon || !hasOutlineIcon) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
// move to resources
|
|
114
|
+
const resource = path_1.default.join(templateAppPackage, "resources");
|
|
115
|
+
await fs_extra_1.default.ensureDir(resource);
|
|
116
|
+
await fs_extra_1.default.move(path_1.default.join(templateAppPackage, manifest.icons.color), path_1.default.join(resource, manifest.icons.color));
|
|
117
|
+
await fs_extra_1.default.move(path_1.default.join(templateAppPackage, manifest.icons.outline), path_1.default.join(resource, manifest.icons.outline));
|
|
118
|
+
// update icons
|
|
119
|
+
manifest.icons.color = `resources/${manifest.icons.color}`;
|
|
120
|
+
manifest.icons.outline = `resources/${manifest.icons.outline}`;
|
|
121
|
+
await fs_extra_1.default.writeFile(path_1.default.join(templateAppPackage, "manifest.template.json"), JSON.stringify(manifest, null, 4));
|
|
122
|
+
}
|
|
123
|
+
async function removeExpiredFields(devProfile, devUserData) {
|
|
124
|
+
const profileData = await fileUtils_1.readJson(devProfile);
|
|
125
|
+
const secrets = __1.deserializeDict(await fs_extra_1.default.readFile(devUserData, "UTF-8"));
|
|
126
|
+
const expiredProfileKeys = [
|
|
127
|
+
[constants_1.PluginNames.LDEBUG, ""],
|
|
128
|
+
[constants_1.PluginNames.SOLUTION, programmingLanguage],
|
|
129
|
+
[constants_1.PluginNames.SOLUTION, defaultFunctionName],
|
|
130
|
+
[constants_1.PluginNames.SOLUTION, "localDebugTeamsAppId"],
|
|
131
|
+
[constants_1.PluginNames.AAD, "local_clientId"],
|
|
132
|
+
[constants_1.PluginNames.AAD, "local_objectId"],
|
|
133
|
+
[constants_1.PluginNames.AAD, "local_tenantId"],
|
|
134
|
+
[constants_1.PluginNames.AAD, "local_clientSecret"],
|
|
135
|
+
[constants_1.PluginNames.AAD, "local_oauth2PermissionScopeId"],
|
|
136
|
+
[constants_1.PluginNames.AAD, "local_applicationIdUris"],
|
|
137
|
+
[constants_1.PluginNames.SA, "filePath"],
|
|
138
|
+
[constants_1.PluginNames.SA, "environmentVariableParams"],
|
|
139
|
+
];
|
|
140
|
+
for (const [k, v] of expiredProfileKeys) {
|
|
141
|
+
if (profileData[k]) {
|
|
142
|
+
if (!v) {
|
|
143
|
+
delete profileData[k];
|
|
144
|
+
}
|
|
145
|
+
else if (profileData[k][v]) {
|
|
146
|
+
delete profileData[k][v];
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
for (const [_, value] of Object.entries(constants_3.LocalDebugConfigKeys)) {
|
|
151
|
+
deleteUserDataKey(secrets, `${constants_1.PluginNames.LDEBUG}.${value}`);
|
|
152
|
+
}
|
|
153
|
+
deleteUserDataKey(secrets, `${constants_1.PluginNames.AAD}.local_clientSecret`);
|
|
154
|
+
await fs_extra_1.default.writeFile(devProfile, JSON.stringify(profileData, null, 4), { encoding: "UTF-8" });
|
|
155
|
+
await fs_extra_1.default.writeFile(devUserData, __1.serializeDict(secrets), { encoding: "UTF-8" });
|
|
156
|
+
}
|
|
157
|
+
function deleteUserDataKey(secrets, key) {
|
|
158
|
+
if (secrets[key]) {
|
|
159
|
+
delete secrets[key];
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
function getConfigDevJson(appName) {
|
|
163
|
+
return __1.environmentManager.newEnvConfigData(appName);
|
|
164
|
+
}
|
|
165
|
+
async function queryProjectStatus(fx) {
|
|
166
|
+
var _a;
|
|
167
|
+
const settings = await fileUtils_1.readJson(path_1.default.join(fx, "settings.json"));
|
|
168
|
+
const solutionSettings = settings.solutionSettings;
|
|
169
|
+
const plugins = ResourcePluginContainer_1.getActivatedResourcePlugins(solutionSettings);
|
|
170
|
+
const envDefaultJson = await fileUtils_1.readJson(path_1.default.join(fx, "env.default.json"));
|
|
171
|
+
const hasFrontend = plugins === null || plugins === void 0 ? void 0 : plugins.some((plugin) => plugin.name === constants_1.PluginNames.FE);
|
|
172
|
+
const hasBackend = plugins === null || plugins === void 0 ? void 0 : plugins.some((plugin) => plugin.name === constants_1.PluginNames.FUNC);
|
|
173
|
+
const hasBot = plugins === null || plugins === void 0 ? void 0 : plugins.some((plugin) => plugin.name === constants_1.PluginNames.BOT);
|
|
174
|
+
const hasProvision = (_a = envDefaultJson.solution) === null || _a === void 0 ? void 0 : _a.provisionSucceeded;
|
|
175
|
+
return { hasFrontend, hasBackend, hasBot, hasProvision };
|
|
176
|
+
}
|
|
177
|
+
async function getMultiEnvFolders(projectPath) {
|
|
178
|
+
const fx = path_1.default.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
|
|
179
|
+
const fxConfig = path_1.default.join(fx, teamsfx_api_1.InputConfigsFolderName);
|
|
180
|
+
const templateAppPackage = path_1.default.join(projectPath, "templates", teamsfx_api_1.AppPackageFolderName);
|
|
181
|
+
const fxPublishProfile = path_1.default.join(fx, teamsfx_api_1.PublishProfilesFolderName);
|
|
182
|
+
await fs_extra_1.default.ensureDir(fxConfig);
|
|
183
|
+
await fs_extra_1.default.ensureDir(templateAppPackage);
|
|
184
|
+
return { fx, fxConfig, templateAppPackage, fxPublishProfile };
|
|
185
|
+
}
|
|
186
|
+
async function removeOldProjectFiles(projectPath) {
|
|
187
|
+
const fx = path_1.default.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
|
|
188
|
+
// backup the env.default.json to migrationbackup folder.
|
|
189
|
+
await fs_extra_1.default.ensureDir(path_1.default.join(fx, "migrationbackup"));
|
|
190
|
+
await fs_extra_1.default.move(path_1.default.join(fx, "env.default.json"), path_1.default.join(fx, "migrationbackup", "env.default.json"));
|
|
191
|
+
await fs_extra_1.default.remove(path_1.default.join(fx, "default.userdata"));
|
|
192
|
+
await fs_extra_1.default.remove(path_1.default.join(fx, "settings.json"));
|
|
193
|
+
await fs_extra_1.default.remove(path_1.default.join(fx, "local.env"));
|
|
194
|
+
await fs_extra_1.default.remove(path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName));
|
|
195
|
+
await fs_extra_1.default.remove(path_1.default.join(fx, "new.env.default.json"));
|
|
196
|
+
// version <= 2.4.1, remove .fx/appPackage.
|
|
197
|
+
await fs_extra_1.default.remove(path_1.default.join(fx, teamsfx_api_1.AppPackageFolderName));
|
|
198
|
+
}
|
|
199
|
+
async function ensureProjectSettings(projectSettingPath, envDefaultPath) {
|
|
200
|
+
var _a;
|
|
201
|
+
const settings = await fileUtils_1.readJson(projectSettingPath);
|
|
202
|
+
if (!settings.programmingLanguage || !settings.defaultFunctionName) {
|
|
203
|
+
const envDefault = await fileUtils_1.readJson(envDefaultPath);
|
|
204
|
+
settings.programmingLanguage = envDefault[constants_1.PluginNames.SOLUTION][programmingLanguage];
|
|
205
|
+
settings.defaultFunctionName = (_a = envDefault[constants_1.PluginNames.FUNC]) === null || _a === void 0 ? void 0 : _a[defaultFunctionName];
|
|
206
|
+
}
|
|
207
|
+
if (!settings.activeEnvironment) {
|
|
208
|
+
settings.activeEnvironment = "dev";
|
|
209
|
+
}
|
|
210
|
+
if (!settings.version) {
|
|
211
|
+
settings.version = "1.0.0";
|
|
212
|
+
}
|
|
213
|
+
await fs_extra_1.default.writeFile(projectSettingPath, JSON.stringify(settings, null, 4), {
|
|
214
|
+
encoding: "UTF-8",
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
async function getAppName(projectSettingPath) {
|
|
218
|
+
const settings = await fileUtils_1.readJson(projectSettingPath);
|
|
219
|
+
return settings.appName;
|
|
220
|
+
}
|
|
221
|
+
async function ensureActiveEnv(projectSettingPath) {
|
|
222
|
+
const settings = await fileUtils_1.readJson(projectSettingPath);
|
|
223
|
+
if (!settings.activeEnvironment) {
|
|
224
|
+
settings.activeEnvironment = "dev";
|
|
225
|
+
await fs_extra_1.default.writeFile(projectSettingPath, JSON.stringify(settings, null, 4), {
|
|
226
|
+
encoding: "UTF-8",
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
async function cleanup(projectPath) {
|
|
231
|
+
const { _, fxConfig, templateAppPackage, fxPublishProfile } = await getMultiEnvFolders(projectPath);
|
|
232
|
+
await fs_extra_1.default.remove(fxConfig);
|
|
233
|
+
await fs_extra_1.default.remove(templateAppPackage);
|
|
234
|
+
await fs_extra_1.default.remove(fxPublishProfile);
|
|
235
|
+
await fs_extra_1.default.remove(path_1.default.join(templateAppPackage, ".."));
|
|
236
|
+
if (await fs_extra_1.default.pathExists(path_1.default.join(fxConfig, "..", "new.env.default.json"))) {
|
|
237
|
+
await fs_extra_1.default.remove(path_1.default.join(fxConfig, "..", "new.env.default.json"));
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
async function needMigrateToArmAndMultiEnv(ctx) {
|
|
241
|
+
if (!preCheckEnvEnabled()) {
|
|
242
|
+
return false;
|
|
243
|
+
}
|
|
244
|
+
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
245
|
+
if (!inputs.projectPath) {
|
|
246
|
+
return false;
|
|
247
|
+
}
|
|
248
|
+
const fxExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx"));
|
|
249
|
+
if (!fxExist) {
|
|
250
|
+
return false;
|
|
251
|
+
}
|
|
252
|
+
const envFileExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx", "env.default.json"));
|
|
253
|
+
const configDirExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx", "configs"));
|
|
254
|
+
const armParameterExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx", "configs", "azure.parameters.dev.json"));
|
|
255
|
+
if (envFileExist && (!armParameterExist || !configDirExist)) {
|
|
256
|
+
return true;
|
|
257
|
+
}
|
|
258
|
+
return false;
|
|
259
|
+
}
|
|
260
|
+
function preCheckEnvEnabled() {
|
|
261
|
+
if (tools_1.isMultiEnvEnabled() && tools_1.isArmSupportEnabled()) {
|
|
262
|
+
return true;
|
|
263
|
+
}
|
|
264
|
+
return false;
|
|
265
|
+
}
|
|
266
|
+
async function migrateArm(ctx) {
|
|
267
|
+
await generateArmTempaltesFiles(ctx);
|
|
268
|
+
await generateArmParameterJson(ctx);
|
|
269
|
+
}
|
|
270
|
+
exports.migrateArm = migrateArm;
|
|
271
|
+
async function removeBotConfig(ctx) {
|
|
272
|
+
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
273
|
+
const fx = path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
|
|
274
|
+
const envConfig = await fs_extra_1.default.readJson(path_1.default.join(fx, "env.default.json"));
|
|
275
|
+
if (envConfig[constants_2.ResourcePlugins.Bot]) {
|
|
276
|
+
delete envConfig[constants_2.ResourcePlugins.Bot];
|
|
277
|
+
envConfig[constants_2.ResourcePlugins.Bot] = { wayToRegisterBot: "create-new" };
|
|
278
|
+
}
|
|
279
|
+
await fs_extra_1.default.writeFile(path_1.default.join(fx, "new.env.default.json"), JSON.stringify(envConfig, null, 4));
|
|
280
|
+
}
|
|
281
|
+
async function generateArmTempaltesFiles(ctx) {
|
|
282
|
+
const minorCtx = { arguments: ctx.arguments };
|
|
283
|
+
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
284
|
+
const core = ctx.self;
|
|
285
|
+
const fx = path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
|
|
286
|
+
const fxConfig = path_1.default.join(fx, teamsfx_api_1.InputConfigsFolderName);
|
|
287
|
+
const templateAzure = path_1.default.join(inputs.projectPath, "templates", "azure");
|
|
288
|
+
await fs_extra_1.default.ensureDir(fxConfig);
|
|
289
|
+
await fs_extra_1.default.ensureDir(templateAzure);
|
|
290
|
+
// load local settings.json
|
|
291
|
+
const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs);
|
|
292
|
+
if (loadRes.isErr()) {
|
|
293
|
+
throw __1.ProjectSettingError();
|
|
294
|
+
}
|
|
295
|
+
const [projectSettings, projectIdMissing] = loadRes.value;
|
|
296
|
+
minorCtx.projectSettings = projectSettings;
|
|
297
|
+
minorCtx.projectIdMissing = projectIdMissing;
|
|
298
|
+
const targetEnvName = "dev";
|
|
299
|
+
const result = await envInfoLoader_1.loadSolutionContext(core.tools, inputs, minorCtx.projectSettings, minorCtx.projectIdMissing, targetEnvName, inputs.ignoreEnvInfo);
|
|
300
|
+
if (result.isErr()) {
|
|
301
|
+
throw __1.SolutionConfigError();
|
|
302
|
+
}
|
|
303
|
+
minorCtx.solutionContext = result.value;
|
|
304
|
+
// generate bicep files.
|
|
305
|
+
try {
|
|
306
|
+
await arm_1.generateArmTemplate(minorCtx.solutionContext);
|
|
307
|
+
}
|
|
308
|
+
catch (error) {
|
|
309
|
+
throw error;
|
|
310
|
+
}
|
|
311
|
+
if (await fs_extra_1.default.pathExists(path_1.default.join(templateAzure, "parameters.template.json"))) {
|
|
312
|
+
await fs_extra_1.default.move(path_1.default.join(templateAzure, "parameters.template.json"), path_1.default.join(fxConfig, "azure.parameters.dev.json"));
|
|
313
|
+
}
|
|
314
|
+
else {
|
|
315
|
+
throw teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to generate parameter.dev.json"), "Solution", "GenerateArmTemplateFailed"));
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
async function generateArmParameterJson(ctx) {
|
|
319
|
+
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
320
|
+
const fx = path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
|
|
321
|
+
const fxConfig = path_1.default.join(fx, teamsfx_api_1.InputConfigsFolderName);
|
|
322
|
+
const envConfig = await fs_extra_1.default.readJson(path_1.default.join(fx, "env.default.json"));
|
|
323
|
+
const targetJson = await fs_extra_1.default.readJson(path_1.default.join(fxConfig, "azure.parameters.dev.json"));
|
|
324
|
+
const ArmParameter = "parameters";
|
|
325
|
+
// frontend hosting
|
|
326
|
+
if (envConfig[constants_2.ResourcePlugins.FrontendHosting]) {
|
|
327
|
+
if (envConfig[constants_2.ResourcePlugins.FrontendHosting][EnvConfigName.StorageName]) {
|
|
328
|
+
targetJson[ArmParameter][ArmParameters.FEStorageName] = {
|
|
329
|
+
value: envConfig[constants_2.ResourcePlugins.FrontendHosting][EnvConfigName.StorageName],
|
|
330
|
+
};
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
// manage identity
|
|
334
|
+
if (envConfig[constants_2.ResourcePlugins.Identity]) {
|
|
335
|
+
if (envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityName]) {
|
|
336
|
+
targetJson[ArmParameter][ArmParameters.IdentityName] = {
|
|
337
|
+
value: envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityName],
|
|
338
|
+
};
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
// azure SQL
|
|
342
|
+
if (envConfig[constants_2.ResourcePlugins.AzureSQL]) {
|
|
343
|
+
if (envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlEndpoint]) {
|
|
344
|
+
targetJson[ArmParameter][ArmParameters.SQLServer] = {
|
|
345
|
+
value: envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlEndpoint].split(".database.windows.net")[0],
|
|
346
|
+
};
|
|
347
|
+
}
|
|
348
|
+
if (envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlDataBase]) {
|
|
349
|
+
targetJson[ArmParameter][ArmParameters.SQLDatabase] = {
|
|
350
|
+
value: envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlDataBase],
|
|
351
|
+
};
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
// SimpleAuth
|
|
355
|
+
if (envConfig[constants_2.ResourcePlugins.SimpleAuth]) {
|
|
356
|
+
if (envConfig[constants_2.ResourcePlugins.SimpleAuth][EnvConfigName.SkuName]) {
|
|
357
|
+
targetJson[ArmParameter][ArmParameters.SimpleAuthSku] = {
|
|
358
|
+
value: envConfig[constants_2.ResourcePlugins.SimpleAuth][EnvConfigName.SkuName],
|
|
359
|
+
};
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
// Function
|
|
363
|
+
if (envConfig[constants_2.ResourcePlugins.Function]) {
|
|
364
|
+
if (envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.AppServicePlanName]) {
|
|
365
|
+
targetJson[ArmParameter][ArmParameters.functionServerName] = {
|
|
366
|
+
value: envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.AppServicePlanName],
|
|
367
|
+
};
|
|
368
|
+
}
|
|
369
|
+
if (envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.StorageAccountName]) {
|
|
370
|
+
targetJson[ArmParameter][ArmParameters.functionStorageName] = {
|
|
371
|
+
value: envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.StorageAccountName],
|
|
372
|
+
};
|
|
373
|
+
}
|
|
374
|
+
if (envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.FuncAppName]) {
|
|
375
|
+
targetJson[ArmParameter][ArmParameters.functionAppName] = {
|
|
376
|
+
value: envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.FuncAppName],
|
|
377
|
+
};
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
await fs_extra_1.default.writeFile(path_1.default.join(fxConfig, "azure.parameters.dev.json"), JSON.stringify(targetJson, null, 4));
|
|
381
|
+
}
|
|
382
|
+
//# sourceMappingURL=projectMigrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectMigrator.js","sourceRoot":"","sources":["../../../src/core/middleware/projectMigrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { Middleware } from "@feathersjs/hooks/lib";
|
|
1
2
|
import { FxError, Inputs, ProjectSettings, Result, SolutionContext, Tools } from "@microsoft/teamsfx-api";
|
|
2
3
|
import { CoreHookContext } from "../..";
|
|
3
|
-
import { Middleware } from "@feathersjs/hooks/lib";
|
|
4
4
|
export declare const ProjectSettingsLoaderMW: Middleware;
|
|
5
|
-
export declare function loadProjectSettings(inputs: Inputs): Promise<Result<[ProjectSettings, boolean], FxError>>;
|
|
5
|
+
export declare function loadProjectSettings(inputs: Inputs, isMultiEnvEnabled?: boolean): Promise<Result<[ProjectSettings, boolean], FxError>>;
|
|
6
6
|
export declare function newSolutionContext(tools: Tools, inputs: Inputs): Promise<SolutionContext>;
|
|
7
7
|
export declare function shouldIgnored(ctx: CoreHookContext): boolean;
|
|
8
8
|
//# sourceMappingURL=projectSettingsLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,OAAO,EAEP,MAAM,EAEN,eAAe,EAEf,MAAM,EACN,eAAe,EAGf,KAAK,EACN,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"projectSettingsLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAGL,OAAO,EAEP,MAAM,EAEN,eAAe,EAEf,MAAM,EACN,eAAe,EAGf,KAAK,EACN,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,eAAe,EAAU,MAAM,OAAO,CAAC;AAchD,eAAO,MAAM,uBAAuB,EAAE,UAqCrC,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CA4BtD;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB/F;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAW3D"}
|
|
@@ -5,16 +5,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.shouldIgnored = exports.newSolutionContext = exports.loadProjectSettings = exports.ProjectSettingsLoaderMW = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
-
const error_1 = require("../error");
|
|
9
|
-
const path = tslib_1.__importStar(require("path"));
|
|
10
8
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
11
|
-
const
|
|
9
|
+
const path = tslib_1.__importStar(require("path"));
|
|
12
10
|
const uuid = tslib_1.__importStar(require("uuid"));
|
|
13
|
-
const
|
|
11
|
+
const __1 = require("..");
|
|
12
|
+
const common_1 = require("../../common");
|
|
13
|
+
const fileUtils_1 = require("../../common/fileUtils");
|
|
14
14
|
const constants_1 = require("../../plugins/solution/fx-solution/constants");
|
|
15
|
+
const crypto_1 = require("../crypto");
|
|
16
|
+
const error_1 = require("../error");
|
|
15
17
|
const permissionRequest_1 = require("../permissionRequest");
|
|
16
|
-
const
|
|
17
|
-
const common_1 = require("../../common");
|
|
18
|
+
const tools_1 = require("../tools");
|
|
18
19
|
const ProjectSettingsLoaderMW = async (ctx, next) => {
|
|
19
20
|
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
20
21
|
if (!shouldIgnored(ctx)) {
|
|
@@ -27,7 +28,7 @@ const ProjectSettingsLoaderMW = async (ctx, next) => {
|
|
|
27
28
|
ctx.result = teamsfx_api_1.err(error_1.PathNotExistError(inputs.projectPath));
|
|
28
29
|
return;
|
|
29
30
|
}
|
|
30
|
-
const loadRes = await loadProjectSettings(inputs);
|
|
31
|
+
const loadRes = await loadProjectSettings(inputs, common_1.isMultiEnvEnabled());
|
|
31
32
|
if (loadRes.isErr()) {
|
|
32
33
|
ctx.result = teamsfx_api_1.err(loadRes.error);
|
|
33
34
|
return;
|
|
@@ -40,17 +41,20 @@ const ProjectSettingsLoaderMW = async (ctx, next) => {
|
|
|
40
41
|
}
|
|
41
42
|
ctx.projectSettings = projectSettings;
|
|
42
43
|
ctx.projectIdMissing = projectIdMissing;
|
|
44
|
+
if (__1.isV2()) {
|
|
45
|
+
ctx.contextV2 = __1.createV2Context(ctx.self, projectSettings);
|
|
46
|
+
}
|
|
43
47
|
}
|
|
44
48
|
await next();
|
|
45
49
|
};
|
|
46
50
|
exports.ProjectSettingsLoaderMW = ProjectSettingsLoaderMW;
|
|
47
|
-
async function loadProjectSettings(inputs) {
|
|
51
|
+
async function loadProjectSettings(inputs, isMultiEnvEnabled = false) {
|
|
48
52
|
try {
|
|
49
53
|
if (!inputs.projectPath) {
|
|
50
54
|
return teamsfx_api_1.err(error_1.NoProjectOpenedError());
|
|
51
55
|
}
|
|
52
56
|
const confFolderPath = path.resolve(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
|
|
53
|
-
const settingsFile =
|
|
57
|
+
const settingsFile = isMultiEnvEnabled
|
|
54
58
|
? path.resolve(confFolderPath, teamsfx_api_1.InputConfigsFolderName, teamsfx_api_1.ProjectSettingsFileName)
|
|
55
59
|
: path.resolve(confFolderPath, "settings.json");
|
|
56
60
|
const projectSettings = await fileUtils_1.readJson(settingsFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;
|
|
1
|
+
{"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"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"}
|