@microsoft/teamsfx-core 1.8.0 → 1.8.1-alpha.324752dff.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/azure-hosting/azureFunctionHosting.d.ts +13 -0
- package/build/common/azure-hosting/azureFunctionHosting.d.ts.map +1 -0
- package/build/common/azure-hosting/azureFunctionHosting.js +26 -0
- package/build/common/azure-hosting/azureFunctionHosting.js.map +1 -0
- package/build/common/azure-hosting/azureHosting.d.ts +14 -0
- package/build/common/azure-hosting/azureHosting.d.ts.map +1 -0
- package/build/common/azure-hosting/azureHosting.js +66 -0
- package/build/common/azure-hosting/azureHosting.js.map +1 -0
- package/build/common/azure-hosting/botServiceHosting.d.ts +7 -0
- package/build/common/azure-hosting/botServiceHosting.d.ts.map +1 -0
- package/build/common/azure-hosting/botServiceHosting.js +16 -0
- package/build/common/azure-hosting/botServiceHosting.js.map +1 -0
- package/build/common/azure-hosting/hostingFactory.d.ts +6 -0
- package/build/common/azure-hosting/hostingFactory.d.ts.map +1 -0
- package/build/common/azure-hosting/hostingFactory.js +22 -0
- package/build/common/azure-hosting/hostingFactory.js.map +1 -0
- package/build/common/azure-hosting/interfaces.d.ts +11 -0
- package/build/common/azure-hosting/interfaces.d.ts.map +1 -0
- package/build/common/azure-hosting/interfaces.js +12 -0
- package/build/common/azure-hosting/interfaces.js.map +1 -0
- package/build/common/azure-hosting/utils.d.ts +3 -0
- package/build/common/azure-hosting/utils.d.ts.map +1 -0
- package/build/common/azure-hosting/utils.js +26 -0
- package/build/common/azure-hosting/utils.js.map +1 -0
- package/build/common/constants.d.ts +1 -2
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -2
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts +1 -0
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +6 -5
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +2 -0
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +2 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +2 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +7 -4
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +8 -4
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/featureFlags.d.ts +1 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +7 -6
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/constants.d.ts +1 -0
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +2 -1
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/projectSettingsHelper.d.ts +1 -0
- package/build/common/local/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/local/projectSettingsHelper.js +5 -0
- package/build/common/local/projectSettingsHelper.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +3 -2
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +32 -4
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config.json +40 -6
- package/build/common/telemetry.d.ts +2 -3
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +1 -2
- package/build/common/telemetry.js.map +1 -1
- package/build/common/template-utils/templates.d.ts +1 -0
- package/build/common/template-utils/templates.d.ts.map +1 -1
- package/build/common/template-utils/templates.js +5 -1
- package/build/common/template-utils/templates.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +4 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +101 -11
- package/build/common/tools.js.map +1 -1
- package/build/component/bicep.d.ts +8 -0
- package/build/component/bicep.d.ts.map +1 -0
- package/build/component/bicep.js +111 -0
- package/build/component/bicep.js.map +1 -0
- package/build/component/botCode.d.ts +13 -0
- package/build/component/botCode.d.ts.map +1 -0
- package/build/component/botCode.js +138 -0
- package/build/component/botCode.js.map +1 -0
- package/build/component/connection.d.ts +8 -0
- package/build/component/connection.d.ts.map +1 -0
- package/build/component/connection.js +84 -0
- package/build/component/connection.js.map +1 -0
- package/build/component/core.d.ts +43 -0
- package/build/component/core.d.ts.map +1 -0
- package/build/component/core.js +714 -0
- package/build/component/core.js.map +1 -0
- package/build/component/debugManager.d.ts +8 -0
- package/build/component/debugManager.d.ts.map +1 -0
- package/build/component/debugManager.js +57 -0
- package/build/component/debugManager.js.map +1 -0
- package/build/component/envManager.d.ts +7 -0
- package/build/component/envManager.d.ts.map +1 -0
- package/build/component/envManager.js +140 -0
- package/build/component/envManager.js.map +1 -0
- package/build/component/projectSettingsManager.d.ts +10 -0
- package/build/component/projectSettingsManager.d.ts.map +1 -0
- package/build/component/projectSettingsManager.js +72 -0
- package/build/component/projectSettingsManager.js.map +1 -0
- package/build/component/resource/aad.d.ts +11 -0
- package/build/component/resource/aad.d.ts.map +1 -0
- package/build/component/resource/aad.js +82 -0
- package/build/component/resource/aad.js.map +1 -0
- package/build/component/resource/azureFunction.d.ts +19 -0
- package/build/component/resource/azureFunction.d.ts.map +1 -0
- package/build/component/resource/azureFunction.js +81 -0
- package/build/component/resource/azureFunction.js.map +1 -0
- package/build/component/resource/azureSql.d.ts +24 -0
- package/build/component/resource/azureSql.d.ts.map +1 -0
- package/build/component/resource/azureSql.js +101 -0
- package/build/component/resource/azureSql.js.map +1 -0
- package/build/component/resource/azureStorage.d.ts +16 -0
- package/build/component/resource/azureStorage.d.ts.map +1 -0
- package/build/component/resource/azureStorage.js +102 -0
- package/build/component/resource/azureStorage.js.map +1 -0
- package/build/component/resource/azureWebApp.d.ts +23 -0
- package/build/component/resource/azureWebApp.d.ts.map +1 -0
- package/build/component/resource/azureWebApp.js +95 -0
- package/build/component/resource/azureWebApp.js.map +1 -0
- package/build/component/resource/botService.d.ts +22 -0
- package/build/component/resource/botService.d.ts.map +1 -0
- package/build/component/resource/botService.js +208 -0
- package/build/component/resource/botService.js.map +1 -0
- package/build/component/resource/index.d.ts +17 -0
- package/build/component/resource/index.d.ts.map +1 -0
- package/build/component/resource/index.js +25 -0
- package/build/component/resource/index.js.map +1 -0
- package/build/component/resource/spfx.d.ts +9 -0
- package/build/component/resource/spfx.d.ts.map +1 -0
- package/build/component/resource/spfx.js +46 -0
- package/build/component/resource/spfx.js.map +1 -0
- package/build/component/resource/teamsManifest.d.ts +19 -0
- package/build/component/resource/teamsManifest.d.ts.map +1 -0
- package/build/component/resource/teamsManifest.js +135 -0
- package/build/component/resource/teamsManifest.js.map +1 -0
- package/build/component/utils.d.ts +18 -0
- package/build/component/utils.d.ts.map +1 -0
- package/build/component/utils.js +354 -0
- package/build/component/utils.js.map +1 -0
- package/build/component/workflow.d.ts +21 -0
- package/build/component/workflow.d.ts.map +1 -0
- package/build/component/workflow.js +445 -0
- package/build/component/workflow.js.map +1 -0
- package/build/core/FxCore.d.ts +2 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +66 -117
- package/build/core/FxCore.js.map +1 -1
- package/build/core/downloadSample.d.ts.map +1 -1
- package/build/core/downloadSample.js +1 -6
- package/build/core/downloadSample.js.map +1 -1
- package/build/core/environment.d.ts +2 -1
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +20 -10
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +0 -1
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +3 -7
- package/build/core/error.js.map +1 -1
- package/build/core/generateAadManifestTemplate.d.ts +10 -0
- package/build/core/generateAadManifestTemplate.d.ts.map +1 -0
- package/build/core/generateAadManifestTemplate.js +100 -0
- package/build/core/generateAadManifestTemplate.js.map +1 -0
- package/build/core/middleware/MigrationUtils.d.ts +10 -0
- package/build/core/middleware/MigrationUtils.d.ts.map +1 -0
- package/build/core/middleware/MigrationUtils.js +63 -0
- package/build/core/middleware/MigrationUtils.js.map +1 -0
- package/build/core/middleware/aadManifestMigration.d.ts.map +1 -1
- package/build/core/middleware/aadManifestMigration.js +33 -117
- package/build/core/middleware/aadManifestMigration.js.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.js +75 -20
- package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
- package/build/core/middleware/envInfoLoader.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoader.js +13 -3
- package/build/core/middleware/envInfoLoader.js.map +1 -1
- package/build/core/middleware/errorHandler.js +1 -1
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.d.ts +3 -0
- package/build/core/middleware/projectVersionChecker.d.ts.map +1 -0
- package/build/core/middleware/projectVersionChecker.js +55 -0
- package/build/core/middleware/projectVersionChecker.js.map +1 -0
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +85 -28
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/questionModelV3.d.ts +6 -0
- package/build/core/middleware/questionModelV3.d.ts.map +1 -0
- package/build/core/middleware/questionModelV3.js +66 -0
- package/build/core/middleware/questionModelV3.js.map +1 -0
- package/build/core/question.d.ts +8 -0
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +105 -11
- package/build/core/question.js.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.d.ts +1 -1
- package/build/plugins/resource/aad/aadAppClient.d.ts.map +1 -1
- package/build/plugins/resource/aad/aadAppClient.js +20 -11
- package/build/plugins/resource/aad/aadAppClient.js.map +1 -1
- package/build/plugins/resource/aad/errors.d.ts +1 -0
- package/build/plugins/resource/aad/errors.d.ts.map +1 -1
- package/build/plugins/resource/aad/errors.js +8 -1
- package/build/plugins/resource/aad/errors.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +1 -1
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +22 -62
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +13 -7
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/apiconnector/checker.d.ts +1 -0
- package/build/plugins/resource/apiconnector/checker.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/checker.js +22 -3
- package/build/plugins/resource/apiconnector/checker.js.map +1 -1
- package/build/plugins/resource/apiconnector/depsHandler.d.ts +1 -0
- package/build/plugins/resource/apiconnector/depsHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/depsHandler.js +22 -2
- package/build/plugins/resource/apiconnector/depsHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/envHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/envHandler.js +10 -1
- package/build/plugins/resource/apiconnector/envHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/errors.d.ts +4 -0
- package/build/plugins/resource/apiconnector/errors.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/errors.js +5 -1
- package/build/plugins/resource/apiconnector/errors.js.map +1 -1
- package/build/plugins/resource/apiconnector/index.d.ts +3 -3
- package/build/plugins/resource/apiconnector/index.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/index.js +7 -4
- package/build/plugins/resource/apiconnector/index.js.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.d.ts +2 -2
- package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.js +21 -14
- package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
- package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/questions.js +6 -2
- package/build/plugins/resource/apiconnector/questions.js.map +1 -1
- package/build/plugins/resource/apiconnector/result.d.ts +4 -3
- package/build/plugins/resource/apiconnector/result.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/result.js.map +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.js +1 -0
- package/build/plugins/resource/apiconnector/sampleHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/telemetry.js +1 -1
- package/build/plugins/resource/apim/constants.d.ts +1 -0
- package/build/plugins/resource/apim/constants.d.ts.map +1 -1
- package/build/plugins/resource/apim/constants.js +1 -0
- package/build/plugins/resource/apim/constants.js.map +1 -1
- package/build/plugins/resource/apim/index.d.ts.map +1 -1
- package/build/plugins/resource/apim/index.js +2 -1
- package/build/plugins/resource/apim/index.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +1 -1
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +2 -0
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +2 -0
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +9 -3
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +1 -1
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.d.ts +4 -0
- package/build/plugins/resource/bot/appStudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/bot/appStudio/appStudio.js +14 -3
- package/build/plugins/resource/bot/appStudio/appStudio.js.map +1 -1
- package/build/plugins/resource/bot/azureOps.d.ts +1 -0
- package/build/plugins/resource/bot/azureOps.d.ts.map +1 -1
- package/build/plugins/resource/bot/azureOps.js +3 -2
- package/build/plugins/resource/bot/azureOps.js.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js.map +1 -1
- package/build/plugins/resource/bot/constants.d.ts +2 -1
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +2 -1
- package/build/plugins/resource/bot/constants.js.map +1 -1
- package/build/plugins/resource/bot/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/index.js +3 -1
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/bot/question.d.ts +1 -2
- package/build/plugins/resource/bot/question.d.ts.map +1 -1
- package/build/plugins/resource/bot/question.js +17 -3
- package/build/plugins/resource/bot/question.js.map +1 -1
- package/build/plugins/resource/bot/resources/strings.d.ts +1 -0
- package/build/plugins/resource/bot/resources/strings.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/common.d.ts +2 -0
- package/build/plugins/resource/bot/utils/common.d.ts.map +1 -1
- package/build/plugins/resource/bot/utils/common.js +14 -1
- package/build/plugins/resource/bot/utils/common.js.map +1 -1
- package/build/plugins/resource/bot/v2/common.d.ts +10 -0
- package/build/plugins/resource/bot/v2/common.d.ts.map +1 -0
- package/build/plugins/resource/bot/v2/common.js +70 -0
- package/build/plugins/resource/bot/v2/common.js.map +1 -0
- package/build/plugins/resource/bot/v2/enum.d.ts +6 -0
- package/build/plugins/resource/bot/v2/enum.d.ts.map +1 -0
- package/build/plugins/resource/bot/v2/enum.js +12 -0
- package/build/plugins/resource/bot/v2/enum.js.map +1 -0
- package/build/plugins/resource/bot/v2/index.d.ts +2 -0
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +14 -0
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/v2/interface/codeTemplateInfo.d.ts +10 -0
- package/build/plugins/resource/bot/v2/interface/codeTemplateInfo.d.ts.map +1 -0
- package/build/plugins/resource/bot/v2/interface/codeTemplateInfo.js +5 -0
- package/build/plugins/resource/bot/v2/interface/codeTemplateInfo.js.map +1 -0
- package/build/plugins/resource/bot/v2/mapping.d.ts +7 -0
- package/build/plugins/resource/bot/v2/mapping.d.ts.map +1 -0
- package/build/plugins/resource/bot/v2/mapping.js +74 -0
- package/build/plugins/resource/bot/v2/mapping.js.map +1 -0
- package/build/plugins/resource/bot/v2/plugin.d.ts +16 -0
- package/build/plugins/resource/bot/v2/plugin.d.ts.map +1 -0
- package/build/plugins/resource/bot/v2/plugin.js +129 -0
- package/build/plugins/resource/bot/v2/plugin.js.map +1 -0
- package/build/plugins/resource/bot/v2/scaffold.d.ts +3 -0
- package/build/plugins/resource/bot/v2/scaffold.d.ts.map +1 -0
- package/build/plugins/resource/bot/v2/scaffold.js +40 -0
- package/build/plugins/resource/bot/v2/scaffold.js.map +1 -0
- package/build/plugins/resource/cicd/index.d.ts.map +1 -1
- package/build/plugins/resource/cicd/index.js +29 -9
- package/build/plugins/resource/cicd/index.js.map +1 -1
- package/build/plugins/resource/cicd/questions.d.ts +2 -0
- package/build/plugins/resource/cicd/questions.d.ts.map +1 -1
- package/build/plugins/resource/cicd/questions.js +3 -1
- package/build/plugins/resource/cicd/questions.js.map +1 -1
- package/build/plugins/resource/cicd/utils/existingTemplatesStat.d.ts +16 -0
- package/build/plugins/resource/cicd/utils/existingTemplatesStat.d.ts.map +1 -0
- package/build/plugins/resource/cicd/utils/existingTemplatesStat.js +75 -0
- package/build/plugins/resource/cicd/utils/existingTemplatesStat.js.map +1 -0
- package/build/plugins/resource/frontend/dotnet/constants.d.ts +0 -10
- package/build/plugins/resource/frontend/dotnet/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/constants.js +1 -12
- package/build/plugins/resource/frontend/dotnet/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/enum.d.ts +0 -10
- package/build/plugins/resource/frontend/dotnet/enum.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/enum.js +1 -12
- package/build/plugins/resource/frontend/dotnet/enum.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/ops/scaffold.js +2 -2
- package/build/plugins/resource/frontend/dotnet/ops/scaffold.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +9 -24
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.d.ts +2 -7
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.js +5 -31
- package/build/plugins/resource/frontend/dotnet/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.js +2 -2
- package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
- package/build/plugins/resource/function/constants.d.ts +1 -2
- package/build/plugins/resource/function/constants.d.ts.map +1 -1
- package/build/plugins/resource/function/constants.js +0 -1
- package/build/plugins/resource/function/constants.js.map +1 -1
- package/build/plugins/resource/function/enums.d.ts +2 -6
- package/build/plugins/resource/function/enums.d.ts.map +1 -1
- package/build/plugins/resource/function/enums.js +2 -7
- package/build/plugins/resource/function/enums.js.map +1 -1
- package/build/plugins/resource/function/language-strategy.d.ts +0 -3
- package/build/plugins/resource/function/language-strategy.d.ts.map +1 -1
- package/build/plugins/resource/function/language-strategy.js +0 -11
- package/build/plugins/resource/function/language-strategy.js.map +1 -1
- package/build/plugins/resource/function/ops/provision.d.ts +1 -5
- package/build/plugins/resource/function/ops/provision.d.ts.map +1 -1
- package/build/plugins/resource/function/ops/provision.js +0 -29
- package/build/plugins/resource/function/ops/provision.js.map +1 -1
- package/build/plugins/resource/function/plugin.d.ts +1 -3
- package/build/plugins/resource/function/plugin.d.ts.map +1 -1
- package/build/plugins/resource/function/plugin.js +8 -33
- package/build/plugins/resource/function/plugin.js.map +1 -1
- package/build/plugins/resource/function/resources/errors.js +2 -2
- package/build/plugins/resource/function/resources/errors.js.map +1 -1
- package/build/plugins/resource/function/v3/index.d.ts +1 -1
- package/build/plugins/resource/function/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/function/v3/index.js +9 -12
- package/build/plugins/resource/function/v3/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +5 -7
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +13 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +13 -1
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/error.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/error.js +7 -1
- package/build/plugins/solution/fx-solution/debug/error.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +17 -0
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.js +32 -29
- package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts +1 -0
- package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js +49 -9
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/settings.d.ts +2 -1
- package/build/plugins/solution/fx-solution/debug/util/settings.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/settings.js +22 -2
- package/build/plugins/solution/fx-solution/debug/util/settings.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.d.ts +1 -0
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.js +40 -2
- package/build/plugins/solution/fx-solution/debug/util/tasksNext.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +12 -1
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +130 -22
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js +1 -1
- package/build/plugins/solution/fx-solution/utils/ResourceGroupHelper.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +37 -4
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +113 -65
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts +6 -0
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +277 -2
- package/build/plugins/solution/fx-solution/v2/getQuestions.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 +48 -20
- 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 +8 -5
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js +1 -1
- package/build/plugins/solution/fx-solution/v2/publish.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/solution.js +4 -1
- package/build/plugins/solution/fx-solution/v2/solution.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts +7 -0
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +23 -1
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +8 -3
- package/resource/aad-manifest-change-logs.md +27 -0
- package/resource/package.nls.json +93 -54
- package/resource/{unify-config-change-logs.md → unify-config-and-aad-manifest-change-logs.md} +10 -3
- package/templates/bicep/azureSql.parameters.json +4 -0
- package/templates/bicep/azureSql.provisionDatabase.module.bicep +15 -0
- package/templates/bicep/azureSql.provisionDatabase.orchestration.bicep +5 -0
- package/templates/bicep/azureSql.provisionServer.module.bicep +44 -0
- package/templates/bicep/azureSql.provisionServer.orchestration.bicep +14 -0
- package/templates/bicep/azureWebApp.config.module.bicep +63 -0
- package/templates/bicep/azureWebApp.config.orchestration.bicep +12 -0
- package/templates/bicep/azureWebApp.parameters.json +4 -0
- package/templates/bicep/azureWebApp.provision.module.bicep +50 -0
- package/templates/bicep/azureWebApp.provision.orchestration.bicep +18 -0
- package/templates/bicep/botService.config.module.bicep +33 -0
- package/templates/bicep/botService.config.orchestration.bicep +8 -0
- package/templates/bicep/config.bicep +3 -0
- package/templates/bicep/main.bicep +18 -0
- package/templates/bicep/provision.bicep +2 -0
- package/templates/core/README.md +4 -4
- package/templates/fallback/blazor-base.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.notification.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/aad/auth/bot/README.md +212 -9
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +4 -1
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-start.html +1 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/showUserInfo.js +19 -2
- package/templates/plugins/resource/aad/auth/bot/js/sso/ssoDialog.js +46 -18
- package/templates/plugins/resource/aad/auth/bot/js/sso/teamsSsoBot.js +13 -5
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +4 -1
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-start.html +1 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/showUserInfo.ts +15 -1
- package/templates/plugins/resource/aad/auth/bot/ts/sso/ssoDialog.ts +42 -11
- package/templates/plugins/resource/aad/auth/bot/ts/sso/teamsSsoBot.ts +7 -1
- package/templates/plugins/resource/aad/auth/tab/README.md +44 -8
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +1 -3
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +1 -3
- package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +23 -11
- package/templates/plugins/resource/aad/auth/tab/js/sso/InitTeamsFx.jsx +20 -0
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +1 -3
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +1 -3
- package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +25 -12
- package/templates/plugins/resource/aad/auth/tab/ts/sso/InitTeamsFx.tsx +20 -0
- package/templates/plugins/resource/apiconnector/package.json +1 -1
- package/templates/plugins/resource/apiconnector/sample/headerComment.template +20 -6
- package/templates/plugins/resource/apiconnector/sample/js/aad.template +1 -1
- package/templates/plugins/resource/apiconnector/sample/js/apikey.template +2 -2
- package/templates/plugins/resource/apiconnector/sample/js/basic.template +1 -1
- package/templates/plugins/resource/apiconnector/sample/js/cert.template +1 -1
- package/templates/plugins/resource/apiconnector/sample/js/custom.template +1 -1
- package/templates/plugins/resource/apiconnector/sample/ts/aad.template +1 -1
- package/templates/plugins/resource/apiconnector/sample/ts/apikey.template +1 -1
- package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep +2 -2
- package/templates/plugins/resource/cicd/azdo/cd.yml +2 -1
- package/templates/plugins/resource/cicd/jenkins/Jenkinsfile.cd +2 -3
- package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +2 -2
- package/templates/plugins/resource/hosting/bicep/botservice/botserviceProvision.template.bicep +34 -0
- package/templates/plugins/resource/hosting/bicep/botservice/parameters.json +4 -0
- package/templates/plugins/resource/hosting/bicep/botservice/provision.template.bicep +8 -0
- package/templates/plugins/resource/hosting/bicep/function/config.template.bicep +12 -0
- package/templates/plugins/resource/hosting/bicep/function/functionConfiguration.template.bicep +71 -0
- package/templates/plugins/resource/hosting/bicep/function/functionProvision.template.bicep +99 -0
- package/templates/plugins/resource/hosting/bicep/function/provision.template.bicep +20 -0
- package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep +1 -1
- package/templates/plugins/resource/spfx/solution/README.md +3 -3
- package/build/plugins/resource/function/utils/node-version.d.ts +0 -2
- package/build/plugins/resource/function/utils/node-version.d.ts.map +0 -1
- package/build/plugins/resource/function/utils/node-version.js +0 -21
- package/build/plugins/resource/function/utils/node-version.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getQuestionsForAddResource = exports.getQuestionsForAddCapability = exports.getQuestionsForUserTask = exports.getQuestions = exports.getTabScaffoldQuestionsV2 = exports.getQuestionsForScaffolding = void 0;
|
|
3
|
+
exports.getQuestionsForAddFeature = exports.getQuestionsForAddResource = exports.getQuestionsForAddCapability = exports.getQuestionsForUserTask = exports.getQuestions = exports.getTabScaffoldQuestionsV2 = exports.getQuestionsForScaffoldingPreview = exports.getQuestionsForScaffolding = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
6
|
const typedi_1 = tslib_1.__importDefault(require("typedi"));
|
|
@@ -20,6 +20,7 @@ const featureFlags_1 = require("../../../../common/featureFlags");
|
|
|
20
20
|
const question_2 = require("../../../../core/question");
|
|
21
21
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
22
22
|
const constants_5 = require("../../../resource/aad/constants");
|
|
23
|
+
const strings_1 = require("../../../resource/bot/resources/strings");
|
|
23
24
|
async function getQuestionsForScaffolding(ctx, inputs) {
|
|
24
25
|
const node = new teamsfx_api_1.QTreeNode({
|
|
25
26
|
name: "azure-solution-group",
|
|
@@ -123,6 +124,108 @@ async function getQuestionsForScaffolding(ctx, inputs) {
|
|
|
123
124
|
return teamsfx_api_1.ok(node);
|
|
124
125
|
}
|
|
125
126
|
exports.getQuestionsForScaffolding = getQuestionsForScaffolding;
|
|
127
|
+
async function getQuestionsForScaffoldingPreview(ctx, inputs) {
|
|
128
|
+
const node = new teamsfx_api_1.QTreeNode({
|
|
129
|
+
name: "azure-solution-group",
|
|
130
|
+
type: "func",
|
|
131
|
+
func: (inputs) => {
|
|
132
|
+
inputs[question_1.AzureSolutionQuestionNames.Solution] = constants_3.TeamsAppSolutionNameV2;
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
if (!globalVars_1.isV3()) {
|
|
136
|
+
node.condition = {
|
|
137
|
+
enum: [
|
|
138
|
+
question_1.TabSPFxItem.id,
|
|
139
|
+
question_1.TabOptionItem.id,
|
|
140
|
+
question_1.BotOptionItem.id,
|
|
141
|
+
question_1.NotificationOptionItem.id,
|
|
142
|
+
question_1.CommandAndResponseOptionItem.id,
|
|
143
|
+
question_1.MessageExtensionItem.id,
|
|
144
|
+
...(tools_1.isAadManifestEnabled() ? [question_1.TabNonSsoItem.id] : []),
|
|
145
|
+
question_1.M365SsoLaunchPageOptionItem.id,
|
|
146
|
+
question_1.M365SearchAppOptionItem.id,
|
|
147
|
+
],
|
|
148
|
+
};
|
|
149
|
+
// 1.1.1 SPFX Tab
|
|
150
|
+
const spfxPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.SpfxPlugin);
|
|
151
|
+
if (spfxPlugin.getQuestionsForScaffolding) {
|
|
152
|
+
const res = await spfxPlugin.getQuestionsForScaffolding(ctx, inputs);
|
|
153
|
+
if (res.isErr())
|
|
154
|
+
return res;
|
|
155
|
+
if (res.value) {
|
|
156
|
+
const spfxNode = res.value;
|
|
157
|
+
spfxNode.condition = {
|
|
158
|
+
validFunc: (input, inputs) => {
|
|
159
|
+
if (!inputs) {
|
|
160
|
+
return "Invalid inputs";
|
|
161
|
+
}
|
|
162
|
+
const cap = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
|
|
163
|
+
if (cap === question_1.TabSPFxItem.id) {
|
|
164
|
+
return undefined;
|
|
165
|
+
}
|
|
166
|
+
return "SPFx is not selected";
|
|
167
|
+
},
|
|
168
|
+
};
|
|
169
|
+
if (spfxNode.data)
|
|
170
|
+
node.addChild(spfxNode);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
node.condition = { enum: [question_1.TabOptionItem.id, question_1.BotOptionItem.id, question_1.MessageExtensionItem.id] };
|
|
176
|
+
}
|
|
177
|
+
// 1.1.2 Azure Tab
|
|
178
|
+
const tabRes = await getTabScaffoldQuestionsV2(ctx, inputs, !featureFlags_1.isPreviewFeaturesEnabled() && teamsfx_api_1.CLIPlatforms.includes(inputs.platform) // only CLI and CLI_HELP support azure-resources question
|
|
179
|
+
);
|
|
180
|
+
if (tabRes.isErr())
|
|
181
|
+
return tabRes;
|
|
182
|
+
if (tabRes.value) {
|
|
183
|
+
const tabNode = tabRes.value;
|
|
184
|
+
tabNode.condition = {
|
|
185
|
+
validFunc: (input, inputs) => {
|
|
186
|
+
if (!inputs) {
|
|
187
|
+
return "Invalid inputs";
|
|
188
|
+
}
|
|
189
|
+
const cap = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
|
|
190
|
+
if (cap === question_1.TabOptionItem.id || cap === question_1.TabNonSsoItem.id) {
|
|
191
|
+
return undefined;
|
|
192
|
+
}
|
|
193
|
+
return "Tab is not selected";
|
|
194
|
+
},
|
|
195
|
+
};
|
|
196
|
+
node.addChild(tabNode);
|
|
197
|
+
}
|
|
198
|
+
// 1.2 Bot
|
|
199
|
+
const botPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
|
|
200
|
+
if (botPlugin.getQuestionsForScaffolding) {
|
|
201
|
+
const res = await botPlugin.getQuestionsForScaffolding(ctx, inputs);
|
|
202
|
+
if (res.isErr())
|
|
203
|
+
return res;
|
|
204
|
+
if (res.value) {
|
|
205
|
+
// Create a parent node of the node returned by plugin to prevent overwriting node.condition.
|
|
206
|
+
const botGroup = new teamsfx_api_1.QTreeNode({ type: "group" });
|
|
207
|
+
botGroup.addChild(res.value);
|
|
208
|
+
botGroup.condition = {
|
|
209
|
+
validFunc: (input, inputs) => {
|
|
210
|
+
if (!inputs) {
|
|
211
|
+
return "Invalid inputs";
|
|
212
|
+
}
|
|
213
|
+
const cap = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
|
|
214
|
+
if (cap === question_1.BotOptionItem.id ||
|
|
215
|
+
cap === question_1.MessageExtensionItem.id ||
|
|
216
|
+
cap === question_1.NotificationOptionItem.id ||
|
|
217
|
+
cap === question_1.CommandAndResponseOptionItem.id) {
|
|
218
|
+
return undefined;
|
|
219
|
+
}
|
|
220
|
+
return "Bot/Message Extension is not selected";
|
|
221
|
+
},
|
|
222
|
+
};
|
|
223
|
+
node.addChild(botGroup);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
return teamsfx_api_1.ok(node);
|
|
227
|
+
}
|
|
228
|
+
exports.getQuestionsForScaffoldingPreview = getQuestionsForScaffoldingPreview;
|
|
126
229
|
async function getTabScaffoldQuestionsV2(ctx, inputs, addAzureResource) {
|
|
127
230
|
const tabNode = new teamsfx_api_1.QTreeNode({ type: "group" });
|
|
128
231
|
//Frontend plugin
|
|
@@ -345,6 +448,9 @@ async function getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider
|
|
|
345
448
|
if (func.method === "addResource") {
|
|
346
449
|
return await getQuestionsForAddResource(ctx, inputs, func, envInfo, tokenProvider);
|
|
347
450
|
}
|
|
451
|
+
if (func.method === "addFeature") {
|
|
452
|
+
return await getQuestionsForAddFeature(ctx, inputs, func, envInfo, tokenProvider);
|
|
453
|
+
}
|
|
348
454
|
if (array.length == 2) {
|
|
349
455
|
const pluginName = array[1];
|
|
350
456
|
const pluginMap = ResourcePluginContainer_1.getAllV2ResourcePluginMap();
|
|
@@ -378,7 +484,7 @@ async function getQuestionsForAddCapability(ctx, inputs, func, envInfo, tokenPro
|
|
|
378
484
|
// For CLI_HELP
|
|
379
485
|
addCapQuestion.staticOptions = [
|
|
380
486
|
...(featureFlags_1.isBotNotificationEnabled() ? [question_1.TabNewUIOptionItem] : [question_1.TabOptionItem]),
|
|
381
|
-
...
|
|
487
|
+
...[question_1.BotOptionItem],
|
|
382
488
|
...(featureFlags_1.isBotNotificationEnabled() ? [question_1.NotificationOptionItem, question_1.CommandAndResponseOptionItem] : []),
|
|
383
489
|
...(featureFlags_1.isBotNotificationEnabled() ? [question_1.MessageExtensionNewUIItem] : [question_1.MessageExtensionItem]),
|
|
384
490
|
...(tools_1.isAadManifestEnabled() ? [question_1.TabNonSsoItem] : []),
|
|
@@ -433,6 +539,7 @@ async function getQuestionsForAddCapability(ctx, inputs, func, envInfo, tokenPro
|
|
|
433
539
|
if (featureFlags_1.isBotNotificationEnabled()) {
|
|
434
540
|
options.push(question_1.CommandAndResponseOptionItem);
|
|
435
541
|
options.push(question_1.NotificationOptionItem);
|
|
542
|
+
options.push(question_1.BotOptionItem);
|
|
436
543
|
}
|
|
437
544
|
else {
|
|
438
545
|
options.push(question_1.BotOptionItem);
|
|
@@ -546,4 +653,172 @@ async function getQuestionsForAddResource(ctx, inputs, func, envInfo, tokenProvi
|
|
|
546
653
|
return teamsfx_api_1.ok(addAzureResourceNode);
|
|
547
654
|
}
|
|
548
655
|
exports.getQuestionsForAddResource = getQuestionsForAddResource;
|
|
656
|
+
async function getStaticOptionsForAddCapability(ctx, inputs, settings) {
|
|
657
|
+
var _a, _b, _c;
|
|
658
|
+
const appStudioPlugin = typedi_1.default.get(constants_4.BuiltInFeaturePluginNames.appStudio);
|
|
659
|
+
const tabExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "staticTab");
|
|
660
|
+
if (tabExceedRes.isErr()) {
|
|
661
|
+
return teamsfx_api_1.err(tabExceedRes.error);
|
|
662
|
+
}
|
|
663
|
+
const isTabAddable = !tabExceedRes.value;
|
|
664
|
+
const botExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "Bot");
|
|
665
|
+
if (botExceedRes.isErr()) {
|
|
666
|
+
return teamsfx_api_1.err(botExceedRes.error);
|
|
667
|
+
}
|
|
668
|
+
const isBotAddable = !botExceedRes.value;
|
|
669
|
+
const meExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "MessageExtension");
|
|
670
|
+
if (meExceedRes.isErr()) {
|
|
671
|
+
return teamsfx_api_1.err(meExceedRes.error);
|
|
672
|
+
}
|
|
673
|
+
// For the new bot, messaging extension and other bots are mutally exclusive.
|
|
674
|
+
// For the old bot, messaging extension can be added when bot exists.
|
|
675
|
+
const botCapabilities = (_b = (_a = ctx.projectSetting.pluginSettings) === null || _a === void 0 ? void 0 : _a[constants_2.PluginNames.BOT]) === null || _b === void 0 ? void 0 : _b[strings_1.PluginBot.BOT_CAPABILITIES];
|
|
676
|
+
const hasNewBot = Array.isArray(botCapabilities) && botCapabilities.length > 0;
|
|
677
|
+
const isMEAddable = featureFlags_1.isBotNotificationEnabled()
|
|
678
|
+
? !meExceedRes.value && !hasNewBot
|
|
679
|
+
: !meExceedRes.value;
|
|
680
|
+
if (!(isTabAddable || isBotAddable || isMEAddable)) {
|
|
681
|
+
(_c = ctx.userInteraction) === null || _c === void 0 ? void 0 : _c.showMessage("error", localizeUtils_1.getLocalizedString("core.addCapability.exceedMaxLimit"), false);
|
|
682
|
+
return teamsfx_api_1.ok([]);
|
|
683
|
+
}
|
|
684
|
+
const options = [];
|
|
685
|
+
if (isBotAddable) {
|
|
686
|
+
options.push(question_1.NotificationOptionItem);
|
|
687
|
+
options.push(question_1.CommandAndResponseOptionItem);
|
|
688
|
+
}
|
|
689
|
+
if (isTabAddable) {
|
|
690
|
+
if (!(settings === null || settings === void 0 ? void 0 : settings.capabilities.includes(question_1.TabOptionItem.id))) {
|
|
691
|
+
options.push(question_1.TabNewUIOptionItem, question_1.TabNonSsoItem);
|
|
692
|
+
}
|
|
693
|
+
else {
|
|
694
|
+
options.push((settings === null || settings === void 0 ? void 0 : settings.capabilities.includes(question_1.TabSsoItem.id)) ? question_1.TabNewUIOptionItem : question_1.TabNonSsoItem);
|
|
695
|
+
}
|
|
696
|
+
}
|
|
697
|
+
if (isBotAddable) {
|
|
698
|
+
options.push(question_1.BotNewUIOptionItem);
|
|
699
|
+
}
|
|
700
|
+
if (isMEAddable) {
|
|
701
|
+
options.push(question_1.MessageExtensionNewUIItem);
|
|
702
|
+
}
|
|
703
|
+
return teamsfx_api_1.ok(options);
|
|
704
|
+
}
|
|
705
|
+
/**
|
|
706
|
+
* Combines the options of AddCapability and AddResource.
|
|
707
|
+
* Only works for VS Code new UI with Preview feature flag enabled.
|
|
708
|
+
*/
|
|
709
|
+
async function getQuestionsForAddFeature(ctx, inputs, func, envInfo, tokenProvider) {
|
|
710
|
+
const settings = ctx.projectSetting.solutionSettings;
|
|
711
|
+
const options = [];
|
|
712
|
+
const addFeatureQuestion = {
|
|
713
|
+
name: question_1.AzureSolutionQuestionNames.Features,
|
|
714
|
+
title: localizeUtils_1.getLocalizedString("core.addFeatureQuestion.title"),
|
|
715
|
+
type: "singleSelect",
|
|
716
|
+
staticOptions: [],
|
|
717
|
+
};
|
|
718
|
+
// check and generate capability options
|
|
719
|
+
const canAddCapabilityResult = executeUserTask_1.canAddCapability(settings, ctx.telemetryReporter);
|
|
720
|
+
if (canAddCapabilityResult.isOk() && !ctx.projectSetting.isM365) {
|
|
721
|
+
const optionsResult = await getStaticOptionsForAddCapability(ctx, inputs, settings);
|
|
722
|
+
if (optionsResult.isErr()) {
|
|
723
|
+
return teamsfx_api_1.err(optionsResult.error);
|
|
724
|
+
}
|
|
725
|
+
options.push(...optionsResult.value);
|
|
726
|
+
}
|
|
727
|
+
// check and generate cloud resource options
|
|
728
|
+
const canAddResourceResult = executeUserTask_1.canAddResource(ctx.projectSetting, ctx.telemetryReporter);
|
|
729
|
+
if (canAddResourceResult.isOk()) {
|
|
730
|
+
// resources
|
|
731
|
+
if (!settings) {
|
|
732
|
+
return teamsfx_api_1.err(new error_1.NoCapabilityFoundError(teamsfx_api_1.Stage.addResource));
|
|
733
|
+
}
|
|
734
|
+
const alreadyHaveAPIM = settings.azureResources.includes(question_1.AzureResourceApim.id);
|
|
735
|
+
const alreadyHaveKeyVault = settings.azureResources.includes(question_1.AzureResourceKeyVault.id);
|
|
736
|
+
const addResourceOptions = question_1.createAddCloudResourceOptions(alreadyHaveAPIM, alreadyHaveKeyVault);
|
|
737
|
+
options.push(...addResourceOptions);
|
|
738
|
+
}
|
|
739
|
+
// Only return error when both of them are errors.
|
|
740
|
+
if (canAddCapabilityResult.isErr() && canAddResourceResult.isErr()) {
|
|
741
|
+
return teamsfx_api_1.err(canAddCapabilityResult.error);
|
|
742
|
+
}
|
|
743
|
+
// check and generate additional feature options
|
|
744
|
+
if (tools_1.canAddSso(ctx.projectSetting)) {
|
|
745
|
+
options.push(question_1.SingleSignOnOptionItem);
|
|
746
|
+
}
|
|
747
|
+
const isApiConnectionAddable = tools_1.canAddApiConnection(settings);
|
|
748
|
+
if (isApiConnectionAddable) {
|
|
749
|
+
options.push(question_1.ApiConnectionOptionItem);
|
|
750
|
+
}
|
|
751
|
+
const isCicdAddable = await tools_1.canAddCICDWorkflows(inputs, ctx);
|
|
752
|
+
if (isCicdAddable) {
|
|
753
|
+
options.push(question_1.CicdOptionItem);
|
|
754
|
+
}
|
|
755
|
+
addFeatureQuestion.staticOptions = options;
|
|
756
|
+
const addFeatureNode = new teamsfx_api_1.QTreeNode(addFeatureQuestion);
|
|
757
|
+
if (!ctx.projectSetting.programmingLanguage) {
|
|
758
|
+
// Language
|
|
759
|
+
const programmingLanguage = new teamsfx_api_1.QTreeNode(question_2.ProgrammingLanguageQuestion);
|
|
760
|
+
programmingLanguage.condition = {
|
|
761
|
+
enum: [
|
|
762
|
+
question_1.NotificationOptionItem.id,
|
|
763
|
+
question_1.CommandAndResponseOptionItem.id,
|
|
764
|
+
question_1.TabNewUIOptionItem.id,
|
|
765
|
+
question_1.TabNonSsoItem.id,
|
|
766
|
+
question_1.BotNewUIOptionItem.id,
|
|
767
|
+
question_1.MessageExtensionItem.id,
|
|
768
|
+
question_1.SingleSignOnOptionItem.id,
|
|
769
|
+
],
|
|
770
|
+
};
|
|
771
|
+
addFeatureNode.addChild(programmingLanguage);
|
|
772
|
+
}
|
|
773
|
+
// traverse plugins' getQuestionsForUserTask
|
|
774
|
+
const pluginsWithResources = [
|
|
775
|
+
[ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin, question_1.BotNewUIOptionItem.id],
|
|
776
|
+
[ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin, question_1.AzureResourceFunction.id],
|
|
777
|
+
];
|
|
778
|
+
if (isCicdAddable) {
|
|
779
|
+
pluginsWithResources.push([ResourcePluginContainer_1.ResourcePluginsV2.CICDPlugin, question_1.CicdOptionItem.id]);
|
|
780
|
+
}
|
|
781
|
+
if (isApiConnectionAddable) {
|
|
782
|
+
pluginsWithResources.push([ResourcePluginContainer_1.ResourcePluginsV2.ApiConnectorPlugin, question_1.ApiConnectionOptionItem.id]);
|
|
783
|
+
}
|
|
784
|
+
const alreadyHaveFunction = settings === null || settings === void 0 ? void 0 : settings.azureResources.includes(question_1.AzureResourceFunction.id);
|
|
785
|
+
for (const pair of pluginsWithResources) {
|
|
786
|
+
const pluginName = pair[0];
|
|
787
|
+
const resourceName = pair[1];
|
|
788
|
+
const plugin = typedi_1.default.get(pluginName);
|
|
789
|
+
if (plugin.getQuestionsForUserTask) {
|
|
790
|
+
const res = await plugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
|
|
791
|
+
if (res.isErr())
|
|
792
|
+
return res;
|
|
793
|
+
if (res.value) {
|
|
794
|
+
const node = res.value;
|
|
795
|
+
if (!node.condition) {
|
|
796
|
+
if (resourceName !== question_1.AzureResourceFunction.id) {
|
|
797
|
+
node.condition = { equals: resourceName };
|
|
798
|
+
}
|
|
799
|
+
else {
|
|
800
|
+
// Azure Function question is related to APIM and SQL
|
|
801
|
+
node.condition = {
|
|
802
|
+
validFunc: (input, inputs) => {
|
|
803
|
+
if (input === question_1.AzureResourceFunction.id) {
|
|
804
|
+
return undefined;
|
|
805
|
+
}
|
|
806
|
+
if (!alreadyHaveFunction &&
|
|
807
|
+
(input === question_1.AzureResourceSQL.id || input === question_1.AzureResourceApim.id)) {
|
|
808
|
+
return undefined;
|
|
809
|
+
}
|
|
810
|
+
return "Function related is not selected";
|
|
811
|
+
},
|
|
812
|
+
};
|
|
813
|
+
}
|
|
814
|
+
}
|
|
815
|
+
if (node.data) {
|
|
816
|
+
addFeatureNode.addChild(node);
|
|
817
|
+
}
|
|
818
|
+
}
|
|
819
|
+
}
|
|
820
|
+
}
|
|
821
|
+
return teamsfx_api_1.ok(addFeatureNode);
|
|
822
|
+
}
|
|
823
|
+
exports.getQuestionsForAddFeature = getQuestionsForAddFeature;
|
|
549
824
|
//# sourceMappingURL=getQuestions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EAEP,aAAa,EACb,EAAE,EAEF,MAAM,EACN,IAAI,
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EAEP,aAAa,EACb,EAAE,EAEF,MAAM,EACN,IAAI,EAQL,MAAM,wBAAwB,CAAC;AAiDhC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0BhC"}
|
|
@@ -21,7 +21,36 @@ const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
|
|
|
21
21
|
const solutionGlobalVars_1 = require("../v3/solutionGlobalVars");
|
|
22
22
|
const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
|
|
23
23
|
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
24
|
+
const util_1 = require("../utils/util");
|
|
25
|
+
function getSubscriptionId(state) {
|
|
26
|
+
if (state && state[constants_1.GLOBAL_CONFIG] && state[constants_1.GLOBAL_CONFIG][constants_1.SUBSCRIPTION_ID]) {
|
|
27
|
+
return state[constants_1.GLOBAL_CONFIG][constants_1.SUBSCRIPTION_ID];
|
|
28
|
+
}
|
|
29
|
+
return "";
|
|
30
|
+
}
|
|
24
31
|
async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
32
|
+
ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ProvisionStart, {
|
|
33
|
+
[constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
|
|
34
|
+
[constants_1.SolutionTelemetryProperty.SubscriptionId]: getSubscriptionId(envInfo.state),
|
|
35
|
+
});
|
|
36
|
+
const result = await provisionResourceImpl(ctx, inputs, envInfo, tokenProvider);
|
|
37
|
+
if (result.isOk()) {
|
|
38
|
+
ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Provision, {
|
|
39
|
+
[constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
|
|
40
|
+
[constants_1.SolutionTelemetryProperty.SubscriptionId]: getSubscriptionId(envInfo.state),
|
|
41
|
+
[constants_1.SolutionTelemetryProperty.Success]: "yes",
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.Provision, result.error, ctx.telemetryReporter, {
|
|
46
|
+
[constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
|
|
47
|
+
[constants_1.SolutionTelemetryProperty.SubscriptionId]: getSubscriptionId(envInfo.state),
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
return result;
|
|
51
|
+
}
|
|
52
|
+
exports.provisionResource = provisionResource;
|
|
53
|
+
async function provisionResourceImpl(ctx, inputs, envInfo, tokenProvider) {
|
|
25
54
|
var _a, _b, _c, _d;
|
|
26
55
|
const azureSolutionSettings = utils_1.getAzureSolutionSettings(ctx);
|
|
27
56
|
// check projectPath
|
|
@@ -82,13 +111,16 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
82
111
|
}
|
|
83
112
|
}
|
|
84
113
|
}
|
|
85
|
-
const
|
|
114
|
+
const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
115
|
+
if (projectSettingsHelper_1.isExistingTabApp(ctx.projectSetting)) {
|
|
116
|
+
// for existing tab app, enable app studio plugin when solution settings is empty.
|
|
117
|
+
const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
|
|
118
|
+
if (!plugins.find((p) => p.name === appStudioPlugin.name)) {
|
|
119
|
+
plugins.push(appStudioPlugin);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
86
122
|
envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
|
|
87
123
|
const solutionInputs = utils_1.extractSolutionInputs(envInfo.state[constants_1.GLOBAL_CONFIG]);
|
|
88
|
-
// for minimized teamsfx project, there is only one plugin (app studio)
|
|
89
|
-
const plugins = pureExistingApp
|
|
90
|
-
? [typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin)]
|
|
91
|
-
: utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
92
124
|
const provisionThunks = plugins
|
|
93
125
|
.filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
|
|
94
126
|
.map((plugin) => {
|
|
@@ -127,19 +159,16 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
127
159
|
const update = contextAdaptor.getEnvStateJson();
|
|
128
160
|
lodash_1.default.assign(envInfo.state, update);
|
|
129
161
|
}
|
|
130
|
-
//
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
const
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
if (result.isErr()) {
|
|
141
|
-
return teamsfx_api_1.err(result.error);
|
|
142
|
-
}
|
|
162
|
+
// call aad.setApplicationInContext
|
|
163
|
+
const aadPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin);
|
|
164
|
+
if (plugins.some((plugin) => plugin.name === aadPlugin.name) && aadPlugin.executeUserTask) {
|
|
165
|
+
const result = await aadPlugin.executeUserTask(ctx, inputs, {
|
|
166
|
+
namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
|
|
167
|
+
method: "setApplicationInContext",
|
|
168
|
+
params: { isLocal: false },
|
|
169
|
+
}, {}, envInfo, tokenProvider);
|
|
170
|
+
if (result.isErr()) {
|
|
171
|
+
return teamsfx_api_1.err(result.error);
|
|
143
172
|
}
|
|
144
173
|
}
|
|
145
174
|
const configureResourceThunks = plugins
|
|
@@ -172,7 +201,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
172
201
|
}
|
|
173
202
|
const msg = localizeUtils_1.getLocalizedString("core.provision.successNotice", ctx.projectSetting.appName);
|
|
174
203
|
(_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
|
|
175
|
-
if (!
|
|
204
|
+
if (!projectSettingsHelper_1.isExistingTabApp(ctx.projectSetting)) {
|
|
176
205
|
const url = tools_1.getResourceGroupInPortal(solutionInputs.subscriptionId, solutionInputs.tenantId, solutionInputs.resourceGroupName);
|
|
177
206
|
if (url) {
|
|
178
207
|
const title = "View Provisioned Resources";
|
|
@@ -205,5 +234,4 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
205
234
|
return teamsfx_api_1.ok(teamsfx_api_1.Void);
|
|
206
235
|
}
|
|
207
236
|
}
|
|
208
|
-
exports.provisionResource = provisionResource;
|
|
209
237
|
//# sourceMappingURL=provision.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAe,aAAa,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAyB/F,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,GACrB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAe,aAAa,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAyB/F,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,GACrB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAyJrC"}
|
|
@@ -46,11 +46,14 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider,
|
|
|
46
46
|
if (m365TenantMatches.isErr()) {
|
|
47
47
|
return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
|
|
48
48
|
}
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
|
|
50
|
+
if (projectSettingsHelper_1.isExistingTabApp(ctx.projectSetting)) {
|
|
51
|
+
// for existing tab app, enable app studio plugin when solution settings is empty.
|
|
52
|
+
const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
|
|
53
|
+
if (!plugins.find((p) => p.name === appStudioPlugin.name)) {
|
|
54
|
+
plugins.push(appStudioPlugin);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
54
57
|
const provisionLocalResourceThunks = plugins
|
|
55
58
|
.filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
|
|
56
59
|
.map((plugin) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":";;;AAAA,wDAA+F;AAC/F,mCAAqC;AACrC,mCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}
|