@microsoft/teamsfx-core 2.0.4-alpha.a99162fe0.0 → 2.0.4-alpha.ceeb9e1b9.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 +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts +1 -2
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +2 -2
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/depsLogger.d.ts +14 -14
- package/build/common/deps-checker/depsLogger.d.ts.map +1 -1
- package/build/common/deps-checker/depsLogger.js +7 -21
- package/build/common/deps-checker/depsLogger.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +40 -35
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +3 -3
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts.map +1 -1
- package/build/common/deps-checker/util/cpUtils.js +4 -4
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/progressIndicator.js +2 -2
- package/build/common/deps-checker/util/progressIndicator.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +3 -0
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -0
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/m365/launchHelper.d.ts +1 -1
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +20 -2
- package/build/common/m365/launchHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +52 -13
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -0
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples.d.ts +4 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +48 -21
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +4 -4
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
- package/build/common/spec-parser/constants.d.ts +4 -0
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +27 -0
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +11 -5
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +4 -1
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +3 -2
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +69 -31
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +5 -19
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +7 -2
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +57 -25
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +21 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +182 -19
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +7 -4
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +42 -8
- package/build/common/telemetry.js.map +1 -1
- package/build/component/configManager/interface.d.ts +0 -1
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +1 -3
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +20 -49
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.js +1 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +5 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +6 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +6 -5
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +54 -55
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +2 -1
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +3 -3
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +1 -0
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +2 -5
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +1 -0
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +2 -5
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +37 -4
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +9 -0
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/arm/deploy.d.ts +1 -3
- package/build/component/driver/arm/deploy.d.ts.map +1 -1
- package/build/component/driver/arm/deploy.js +1 -14
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +8 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +7 -6
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +1 -0
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +2 -5
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts +1 -0
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +4 -10
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts +0 -2
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +0 -10
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts +0 -2
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +0 -10
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts +0 -2
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +17 -19
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +10 -3
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +29 -16
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +18 -15
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +4 -4
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +1 -0
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +24 -2
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +1 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +34 -12
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +10 -16
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts +1 -0
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +3 -9
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +2 -7
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.d.ts +1 -0
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +4 -10
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +1 -0
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/baseBuildStepDriver.d.ts +0 -2
- package/build/component/driver/script/baseBuildStepDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildStepDriver.js +0 -4
- package/build/component/driver/script/baseBuildStepDriver.js.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.d.ts +0 -2
- package/build/component/driver/script/dotnetBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.js +0 -9
- package/build/component/driver/script/dotnetBuildDriver.js.map +1 -1
- package/build/component/driver/script/npmBuildDriver.d.ts +0 -2
- package/build/component/driver/script/npmBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npmBuildDriver.js +0 -9
- package/build/component/driver/script/npmBuildDriver.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.d.ts +0 -2
- package/build/component/driver/script/npxBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +0 -9
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +10 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +31 -30
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +8 -8
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +5 -5
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +31 -11
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +2 -0
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +1 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +3 -11
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts +1 -2
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +4 -11
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +6 -11
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +3 -3
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +28 -40
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +2 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +0 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +5 -13
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +2 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +2 -2
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +21 -10
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +1 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +3 -11
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +3 -11
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +28 -9
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +3 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +42 -16
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +23 -26
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +6 -0
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +13 -1
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +28 -19
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +2 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +8 -2
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/generator.js +3 -3
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +6 -2
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +4 -2
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +3 -3
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +2 -2
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +3 -3
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/utils.d.ts +2 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +13 -13
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/messages.d.ts +2 -3
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +3 -4
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.d.ts +2 -2
- package/build/component/middleware/actionExecutionMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +1 -1
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/provisionUtils.d.ts +3 -3
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +3 -3
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +24 -2
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts +2 -2
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +6 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/telemetry.js +2 -2
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +2 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +1 -4
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/charsetUtils.js +3 -3
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.js +1 -1
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +8 -4
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +2 -2
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +15 -19
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +800 -60
- package/build/core/FxCore.js.map +1 -1
- package/build/core/globalVars.d.ts +16 -0
- package/build/core/globalVars.d.ts.map +1 -1
- package/build/core/globalVars.js +34 -1
- package/build/core/globalVars.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +7 -3
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +2 -1
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +3 -0
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/common.d.ts +0 -6
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +1 -29
- package/build/error/common.js.map +1 -1
- package/build/index.d.ts +2 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +2 -0
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +2 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +2 -2
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +4 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +63 -36
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +11 -17
- package/build/question/generator.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +4 -4
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +16 -17
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +1 -1
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +2 -2
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +2 -2
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/options/PreviewTeamsAppOptions.js +2 -2
- package/build/question/options/PreviewTeamsAppOptions.js.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.js +2 -3
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -1
- package/build/question/options/ValidateTeamsAppOptions.js +2 -2
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +7 -5
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +5 -2
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +7 -3
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/validationUtils.d.ts +17 -1
- package/build/ui/validationUtils.d.ts.map +1 -1
- package/build/ui/validationUtils.js +206 -17
- package/build/ui/validationUtils.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +17 -17
- package/build/ui/visitor.js.map +1 -1
- package/package.json +13 -13
- package/resource/package.nls.json +10 -8
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Tab/GetUserProfile.razor +1 -2
- package/templates/plugins/resource/aad/auth/tab/csharp/GetUserProfile.razor +1 -2
- package/build/common/samples-config-v3.json +0 -446
- package/build/component/driver/middleware/updateProgress.d.ts +0 -6
- package/build/component/driver/middleware/updateProgress.d.ts.map +0 -1
- package/build/component/driver/middleware/updateProgress.js +0 -15
- package/build/component/driver/middleware/updateProgress.js.map +0 -1
- package/build/core/FxCoreImplementV3.d.ts +0 -51
- package/build/core/FxCoreImplementV3.d.ts.map +0 -1
- package/build/core/FxCoreImplementV3.js +0 -736
- package/build/core/FxCoreImplementV3.js.map +0 -1
|
@@ -17,7 +17,7 @@ const fs = tslib_1.__importStar(require("fs-extra"));
|
|
|
17
17
|
const componentError_1 = require("../../../../error/componentError");
|
|
18
18
|
const azureSdkErrorHandler_1 = require("../../../../utils/azureSdkErrorHandler");
|
|
19
19
|
const localizeUtils_1 = require("../../../../../common/localizeUtils");
|
|
20
|
-
const
|
|
20
|
+
const error_1 = require("../../../../../error");
|
|
21
21
|
class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
22
22
|
constructor() {
|
|
23
23
|
super(...arguments);
|
|
@@ -64,14 +64,17 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
64
64
|
let res;
|
|
65
65
|
for (let i = 0; i < deployConstant_1.DeployConstant.DEPLOY_CHECK_RETRY_TIMES; ++i) {
|
|
66
66
|
try {
|
|
67
|
+
this.logger.verbose(`Check deploy status with location: ${location}`);
|
|
67
68
|
res = await AzureDeployImpl.AXIOS_INSTANCE.get(location, config);
|
|
69
|
+
this.logger.verbose(`Check deploy status response: ${JSON.stringify(res, Object.getOwnPropertyNames(res))}`);
|
|
68
70
|
}
|
|
69
71
|
catch (e) {
|
|
72
|
+
this.logger.verbose(`Check deploy status failed with error: ${JSON.stringify(e, Object.getOwnPropertyNames(e), 2)}`);
|
|
70
73
|
if (axios_1.default.isAxiosError(e)) {
|
|
71
|
-
|
|
72
|
-
throw new
|
|
74
|
+
logger.error(`Check deploy status failed with response status code: ${(_b = (_a = e.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : "NA"}, message: ${JSON.stringify((_c = e.response) === null || _c === void 0 ? void 0 : _c.data)}`);
|
|
75
|
+
throw new error_1.CheckDeploymentStatusError(location, new Error(`status code: ${(_e = (_d = e.response) === null || _d === void 0 ? void 0 : _d.status) !== null && _e !== void 0 ? _e : "NA"}, message: ${JSON.stringify((_f = e.response) === null || _f === void 0 ? void 0 : _f.data)}`), this.helpLink);
|
|
73
76
|
}
|
|
74
|
-
throw new
|
|
77
|
+
throw new error_1.CheckDeploymentStatusError(location, e, this.helpLink);
|
|
75
78
|
}
|
|
76
79
|
if (res) {
|
|
77
80
|
if ((res === null || res === void 0 ? void 0 : res.status) === commonConstant_1.HttpStatusCode.ACCEPTED) {
|
|
@@ -79,19 +82,19 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
79
82
|
}
|
|
80
83
|
else if ((res === null || res === void 0 ? void 0 : res.status) === commonConstant_1.HttpStatusCode.OK || (res === null || res === void 0 ? void 0 : res.status) === commonConstant_1.HttpStatusCode.CREATED) {
|
|
81
84
|
if (((_g = res.data) === null || _g === void 0 ? void 0 : _g.status) === deployConstant_1.DeployStatus.Failed) {
|
|
82
|
-
|
|
85
|
+
this.logger.warning(localizeUtils_1.getDefaultString("error.deploy.DeployRemoteStartError", location, JSON.stringify(res.data)));
|
|
83
86
|
}
|
|
84
87
|
return res.data;
|
|
85
88
|
}
|
|
86
89
|
else {
|
|
87
90
|
if (res.status) {
|
|
88
|
-
|
|
91
|
+
logger.error(`Deployment is failed with error code: ${res.status}.`);
|
|
89
92
|
}
|
|
90
|
-
throw new
|
|
93
|
+
throw new error_1.CheckDeploymentStatusError(location, new Error(`status code: ${(_h = res.status) !== null && _h !== void 0 ? _h : "NA"}`), this.helpLink);
|
|
91
94
|
}
|
|
92
95
|
}
|
|
93
96
|
}
|
|
94
|
-
throw new
|
|
97
|
+
throw new error_1.CheckDeploymentStatusTimeoutError(this.helpLink);
|
|
95
98
|
}
|
|
96
99
|
/**
|
|
97
100
|
* create azure deploy config for Azure Function and Azure App service
|
|
@@ -105,7 +108,7 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
105
108
|
const defaultScope = "https://management.azure.com/.default";
|
|
106
109
|
const token = await azureCredential.getToken(defaultScope);
|
|
107
110
|
if (token) {
|
|
108
|
-
|
|
111
|
+
this.logger.info("Get AAD token successfully. Upload zip package through AAD Auth mode.");
|
|
109
112
|
return {
|
|
110
113
|
headers: {
|
|
111
114
|
"Content-Type": "application/octet-stream",
|
|
@@ -121,21 +124,21 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
121
124
|
this.context.telemetryReporter.sendTelemetryErrorEvent("Get-Deploy-AAD-token-failed", {
|
|
122
125
|
error: "AAD token is empty.",
|
|
123
126
|
});
|
|
124
|
-
|
|
127
|
+
this.logger.info("Get AAD token failed. AAD Token is empty. Upload zip package through basic auth mode. Please check your Azure credential.");
|
|
125
128
|
}
|
|
126
129
|
}
|
|
127
130
|
catch (e) {
|
|
128
131
|
this.context.telemetryReporter.sendTelemetryErrorEvent("Get-Deploy-AAD-token-failed", {
|
|
129
132
|
error: e.toString(),
|
|
130
133
|
});
|
|
131
|
-
|
|
134
|
+
this.logger.info(`Get AAD token failed with error: ${JSON.stringify(e, Object.getOwnPropertyNames(e))}. Upload zip package through basic auth mode.`);
|
|
132
135
|
}
|
|
133
136
|
// IF only enable AAD deploy, throw error
|
|
134
137
|
if (process.env["TEAMSFX_AAD_DEPLOY_ONLY"] === "true") {
|
|
135
|
-
throw new
|
|
138
|
+
throw new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, new Error("Get AAD token failed."), this.helpLink);
|
|
136
139
|
}
|
|
137
140
|
const managementClient = this.managementClient;
|
|
138
|
-
const listResponse = await azureSdkErrorHandler_1.wrapAzureOperation(() => managementClient.webApps.beginListPublishingCredentialsAndWait(azureResource.resourceGroupName, azureResource.instanceId), (e) => new
|
|
141
|
+
const listResponse = await azureSdkErrorHandler_1.wrapAzureOperation(() => managementClient.webApps.beginListPublishingCredentialsAndWait(azureResource.resourceGroupName, azureResource.instanceId), (e) => new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, e, this.helpLink), (e) => new error_1.GetPublishingCredentialsError(azureResource.instanceId, azureResource.resourceGroupName, e, this.helpLink));
|
|
139
142
|
const publishingUserName = (_a = listResponse.publishingUserName) !== null && _a !== void 0 ? _a : "";
|
|
140
143
|
const publishingPassword = (_b = listResponse.publishingPassword) !== null && _b !== void 0 ? _b : "";
|
|
141
144
|
const encryptedCredentials = js_base64_1.Base64.encode(`${publishingUserName}:${publishingPassword}`);
|
|
@@ -152,12 +155,12 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
152
155
|
}
|
|
153
156
|
async restartFunctionApp(azureResource) {
|
|
154
157
|
var _a, _b;
|
|
155
|
-
|
|
158
|
+
this.context.logProvider.debug("Restarting function app...");
|
|
156
159
|
try {
|
|
157
160
|
await ((_b = (_a = this.managementClient) === null || _a === void 0 ? void 0 : _a.webApps) === null || _b === void 0 ? void 0 : _b.restart(azureResource.resourceGroupName, azureResource.instanceId));
|
|
158
161
|
}
|
|
159
162
|
catch (e) {
|
|
160
|
-
|
|
163
|
+
this.logger.warning(localizeUtils_1.getLocalizedString("driver.deploy.error.restartWebAppError"));
|
|
161
164
|
}
|
|
162
165
|
}
|
|
163
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AASlC,qDAA4D;AAE5D,qDAAkD;AAClD,yCAAmC;AACnC,0EAAoD;AACpD,wEAAmF;AACnF,0DAAyC;AACzC,uDAA0D;AAC1D,wEAAqE;AACrE,qFAGkD;AAGlD,qDAA+B;AAC/B,qEAAqE;AACrE,iFAA4E;AAC5E,uEAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAElG,OAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKxC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAGL,gBAAgB,EAChB,eAAe,EACf,WAAW,EAGZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,8BAAsB,cAAc;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,UAAS;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC;IAC/B,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IAC/D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IACnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;IAClD,SAAS,CAAC,eAAe,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAM;gBAErC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa;IAejD,QAAQ,CAAC,iBAAiB,IAAI,IAAI;IAElC,SAAS,CAAC,MAAM,CAAC,YAAY,+DAO1B;IAEG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAkBrC,OAAO,CAAC,UAAU;cAIF,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;cAuB3E,gBAAgB,CAAC,EAAE,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"baseDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAElG,OAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKxC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAGL,gBAAgB,EAChB,eAAe,EACf,WAAW,EAGZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,8BAAsB,cAAc;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,aAAa,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,UAAS;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC;IAC/B,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IAC/D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IACnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;IAClD,SAAS,CAAC,eAAe,EAAE,CAAC,MAAM,MAAM,CAAC,EAAE,CAAM;gBAErC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa;IAejD,QAAQ,CAAC,iBAAiB,IAAI,IAAI;IAElC,SAAS,CAAC,MAAM,CAAC,YAAY,+DAO1B;IAEG,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IAkBrC,OAAO,CAAC,UAAU;cAIF,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;cAuB3E,gBAAgB,CAAC,EAAE,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IA2BhG;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CACpD"}
|
|
@@ -30,7 +30,7 @@ class BaseDeployImpl {
|
|
|
30
30
|
this.progressBar = context.progressBar;
|
|
31
31
|
}
|
|
32
32
|
async run() {
|
|
33
|
-
|
|
33
|
+
this.context.logProvider.debug("start deploy process");
|
|
34
34
|
this.updateProgressbar();
|
|
35
35
|
return await this.wrapErrorHandler(async () => {
|
|
36
36
|
var _a, _b;
|
|
@@ -66,7 +66,7 @@ class BaseDeployImpl {
|
|
|
66
66
|
});
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
|
-
|
|
69
|
+
context.logProvider.warning(`already set deploy ignore file ${args.ignoreFile} but file not exists in ${this.workingDirectory}, skip ignore!`);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
return ig;
|
|
@@ -80,7 +80,7 @@ class BaseDeployImpl {
|
|
|
80
80
|
catch (e) {
|
|
81
81
|
if (e instanceof componentError_1.BaseComponentInnerError) {
|
|
82
82
|
const errorDetail = e.detail ? `Detail: ${e.detail}` : "";
|
|
83
|
-
|
|
83
|
+
this.context.logProvider.error(`${e.message} ${errorDetail}`);
|
|
84
84
|
return { result: teamsfx_api_1.err(e.toFxError()), summaries: [] };
|
|
85
85
|
}
|
|
86
86
|
else if (e instanceof teamsfx_api_1.SystemError || e instanceof teamsfx_api_1.UserError) {
|
|
@@ -90,7 +90,7 @@ class BaseDeployImpl {
|
|
|
90
90
|
};
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
93
|
-
|
|
93
|
+
this.context.logProvider.error(`Unknown error: ${JSON.stringify(e, Object.getOwnPropertyNames(e))}`);
|
|
94
94
|
return {
|
|
95
95
|
result: teamsfx_api_1.err(componentError_1.BaseComponentInnerError.unknownError("Deploy", e).toFxError()),
|
|
96
96
|
summaries: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAMlC,qEAA2E;AAC3E,4DAAwC;AACxC,wEAAqE;AACrE,mDAA6B;AAC7B,qDAA+B;AAC/B,qDAAsF;AAEtF,wDAQgC;AAGhC,MAAsB,cAAc;IAgBlC,YAAY,IAAa,EAAE,OAAsB;QAXjD,WAAM,GAAG,KAAK,CAAC;QAML,aAAQ,GAAuB,SAAS,CAAC;QAGzC,oBAAe,GAAqB,EAAE,CAAC;QAG/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG;YACb,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;YAClD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;SAC7C,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACzC,CAAC;IAaD,KAAK,CAAC,GAAG;QACP,
|
|
1
|
+
{"version":3,"file":"baseDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/baseDeployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { WrapDriverContext } from "../../util/wrapUtil";
|
|
|
5
5
|
import { DeploySPFxArgs } from "./interface/deployArgs";
|
|
6
6
|
export declare class SPFxDeployDriver implements StepDriver {
|
|
7
7
|
readonly description: string;
|
|
8
|
+
readonly progressTitle: string;
|
|
8
9
|
private readonly EmptyMap;
|
|
9
10
|
private asDeployArgs;
|
|
10
11
|
run(args: DeploySPFxArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/spfx/deployDriver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAY,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAUtF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"deployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/spfx/deployDriver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAY,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAUtF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AASxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAMxD,qBACa,gBAAiB,YAAW,UAAU;IACjD,SAAgB,WAAW,SAAwD;IACnF,SAAgB,aAAa,SAAoE;IAEjG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IAEtD,OAAO,CAAC,YAAY,CAGjB;IAKU,GAAG,CACd,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IASnC,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAa3E,MAAM,CACjB,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAmHlB,SAAS,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAiC5D,cAAc,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAS3D,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAQnE"}
|
|
@@ -15,7 +15,6 @@ const tools_1 = require("../../../../common/tools");
|
|
|
15
15
|
const common_1 = require("../../../../error/common");
|
|
16
16
|
const common_2 = require("../../../utils/common");
|
|
17
17
|
const addStartAndEndTelemetry_1 = require("../../middleware/addStartAndEndTelemetry");
|
|
18
|
-
const updateProgress_1 = require("../../middleware/updateProgress");
|
|
19
18
|
const wrapUtil_1 = require("../../util/wrapUtil");
|
|
20
19
|
const createAppCatalogFailedError_1 = require("./error/createAppCatalogFailedError");
|
|
21
20
|
const getGraphTokenFailedError_1 = require("./error/getGraphTokenFailedError");
|
|
@@ -28,9 +27,11 @@ const uploadAppPackageFailedError_1 = require("./error/uploadAppPackageFailedErr
|
|
|
28
27
|
const constants_1 = require("./utility/constants");
|
|
29
28
|
const sleep_1 = require("./utility/sleep");
|
|
30
29
|
const spoClient_1 = require("./utility/spoClient");
|
|
30
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
31
31
|
let SPFxDeployDriver = class SPFxDeployDriver {
|
|
32
32
|
constructor() {
|
|
33
33
|
this.description = localizeUtils_1.getLocalizedString("driver.spfx.deploy.description");
|
|
34
|
+
this.progressTitle = localizeUtils_1.getLocalizedString("driver.spfx.deploy.progressbar.stepMessage");
|
|
34
35
|
this.EmptyMap = new Map();
|
|
35
36
|
this.asDeployArgs = common_2.asFactory({
|
|
36
37
|
createAppCatalogIfNotExist: common_2.asBoolean,
|
|
@@ -52,22 +53,29 @@ let SPFxDeployDriver = class SPFxDeployDriver {
|
|
|
52
53
|
async deploy(args, context) {
|
|
53
54
|
var _a, _b, _c;
|
|
54
55
|
const deployArgs = this.asDeployArgs(args);
|
|
56
|
+
context.logProvider.debug(`Getting user tenant...`);
|
|
55
57
|
const tenant = await this.getTenant(context.m365TokenProvider);
|
|
56
58
|
spoClient_1.SPOClient.setBaseUrl(tenant);
|
|
59
|
+
context.logProvider.debug(`Succeeded to get user tenant: ${tenant}.`);
|
|
57
60
|
const spoToken = await tools_1.getSPFxToken(context.m365TokenProvider);
|
|
58
61
|
if (!spoToken) {
|
|
59
62
|
throw new getSPOTokenFailedError_1.GetSPOTokenFailedError();
|
|
60
63
|
}
|
|
64
|
+
context.logProvider.verbose(`Getting SharePoint app catalog site...`);
|
|
61
65
|
let appCatalogSite = await spoClient_1.SPOClient.getAppCatalogSite(spoToken);
|
|
62
66
|
if (appCatalogSite) {
|
|
67
|
+
context.logProvider.verbose(`Succeeded to get SharePoint app catalog site: ${appCatalogSite}.`);
|
|
63
68
|
spoClient_1.SPOClient.setBaseUrl(appCatalogSite);
|
|
64
69
|
context.addSummary(constants_1.DeployProgressMessage.SkipCreateSPAppCatalog());
|
|
65
70
|
}
|
|
66
71
|
else {
|
|
72
|
+
context.logProvider.verbose(`Failed to get valid SharePoint app catalog site under current tenant.`);
|
|
67
73
|
if (deployArgs.createAppCatalogIfNotExist) {
|
|
74
|
+
context.logProvider.verbose(`Creating app catalog for user since there's no existing one...`);
|
|
68
75
|
try {
|
|
69
76
|
await spoClient_1.SPOClient.createAppCatalog(spoToken);
|
|
70
77
|
context.addSummary(constants_1.DeployProgressMessage.CreateSPAppCatalog());
|
|
78
|
+
context.logProvider.verbose(`Succeeded to create app catalog.`);
|
|
71
79
|
}
|
|
72
80
|
catch (e) {
|
|
73
81
|
throw new createAppCatalogFailedError_1.CreateAppCatalogFailedError(e);
|
|
@@ -77,6 +85,7 @@ let SPFxDeployDriver = class SPFxDeployDriver {
|
|
|
77
85
|
throw new noValidAppCatelogError_1.NoValidAppCatelog();
|
|
78
86
|
}
|
|
79
87
|
let retry = 0;
|
|
88
|
+
context.logProvider.verbose(`Getting newly created app catalog site...`);
|
|
80
89
|
appCatalogSite = await spoClient_1.SPOClient.getAppCatalogSite(spoToken);
|
|
81
90
|
while (appCatalogSite == null && retry < constants_1.Constants.APP_CATALOG_MAX_TIMES) {
|
|
82
91
|
void context.logProvider.warning(localizeUtils_1.getLocalizedString("driver.spfx.warn.noTenantAppCatalogFound", retry));
|
|
@@ -85,6 +94,7 @@ let SPFxDeployDriver = class SPFxDeployDriver {
|
|
|
85
94
|
retry += 1;
|
|
86
95
|
}
|
|
87
96
|
if (appCatalogSite) {
|
|
97
|
+
context.logProvider.verbose(`Succeeded to get newly created app catalog site: ${appCatalogSite}.`);
|
|
88
98
|
spoClient_1.SPOClient.setBaseUrl(appCatalogSite);
|
|
89
99
|
void context.logProvider.info(localizeUtils_1.getLocalizedString("driver.spfx.info.tenantAppCatalogCreated", appCatalogSite));
|
|
90
100
|
await sleep_1.sleep(constants_1.Constants.APP_CATALOG_ACTIVE_TIME);
|
|
@@ -96,15 +106,19 @@ let SPFxDeployDriver = class SPFxDeployDriver {
|
|
|
96
106
|
const packageSolutionPath = path_1.default.isAbsolute(deployArgs.packageSolutionPath)
|
|
97
107
|
? deployArgs.packageSolutionPath
|
|
98
108
|
: path_1.default.join(context.projectPath, deployArgs.packageSolutionPath);
|
|
109
|
+
context.logProvider.debug(`Getting zipped package path from package-solution.json file under ${packageSolutionPath}...`);
|
|
99
110
|
const appPackage = await this.getPackagePath(packageSolutionPath);
|
|
100
111
|
if (!(await fs_extra_1.default.pathExists(appPackage))) {
|
|
101
112
|
throw new noSPPackageError_1.NoSPPackageError(appPackage);
|
|
102
113
|
}
|
|
114
|
+
context.logProvider.debug(`Succeeded to get zipped package path: ${appPackage}.`);
|
|
103
115
|
const fileName = path_1.default.parse(appPackage).base;
|
|
104
116
|
const bytes = await fs_extra_1.default.readFile(appPackage);
|
|
105
117
|
try {
|
|
118
|
+
context.logProvider.verbose(`Uploading SharePoint app package ${fileName}...`);
|
|
106
119
|
await spoClient_1.SPOClient.uploadAppPackage(spoToken, fileName, bytes);
|
|
107
120
|
context.addSummary(constants_1.DeployProgressMessage.Upload());
|
|
121
|
+
context.logProvider.verbose(`Succeeded to upload SharePoint app package.`);
|
|
108
122
|
}
|
|
109
123
|
catch (e) {
|
|
110
124
|
if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
|
|
@@ -114,9 +128,12 @@ let SPFxDeployDriver = class SPFxDeployDriver {
|
|
|
114
128
|
throw new uploadAppPackageFailedError_1.UploadAppPackageFailedError(e);
|
|
115
129
|
}
|
|
116
130
|
}
|
|
131
|
+
context.logProvider.debug(`Getting app id from package-solution.json file under ${packageSolutionPath}...`);
|
|
117
132
|
const appID = await this.getAppID(packageSolutionPath);
|
|
133
|
+
context.logProvider.verbose(`Deploying SharePoint app package with app id: ${appID}...`);
|
|
118
134
|
await spoClient_1.SPOClient.deployAppPackage(spoToken, appID);
|
|
119
135
|
context.addSummary(constants_1.DeployProgressMessage.Deploy());
|
|
136
|
+
context.logProvider.verbose(`Succeeded to deploy SharePoint app package.`);
|
|
120
137
|
const guidance = localizeUtils_1.getLocalizedString("plugins.spfx.deployNotice", appPackage, appCatalogSite, appCatalogSite);
|
|
121
138
|
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
122
139
|
(_b = context.ui) === null || _b === void 0 ? void 0 : _b.showMessage("info", guidance, false);
|
|
@@ -177,12 +194,17 @@ let SPFxDeployDriver = class SPFxDeployDriver {
|
|
|
177
194
|
tslib_1.__decorate([
|
|
178
195
|
lib_1.hooks([
|
|
179
196
|
addStartAndEndTelemetry_1.addStartAndEndTelemetry(constants_1.Constants.TelemetryDeployEventName, constants_1.Constants.TelemetryComponentName),
|
|
180
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.spfx.deploy.progressbar.stepMessage")),
|
|
181
197
|
]),
|
|
182
198
|
tslib_1.__metadata("design:type", Function),
|
|
183
199
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
184
200
|
tslib_1.__metadata("design:returntype", Promise)
|
|
185
201
|
], SPFxDeployDriver.prototype, "run", null);
|
|
202
|
+
tslib_1.__decorate([
|
|
203
|
+
lib_1.hooks([globalVars_1.ErrorContextMW({ source: "SPFx", component: "SPFxDeployDriver" })]),
|
|
204
|
+
tslib_1.__metadata("design:type", Function),
|
|
205
|
+
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
|
|
206
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
207
|
+
], SPFxDeployDriver.prototype, "deploy", null);
|
|
186
208
|
SPFxDeployDriver = tslib_1.__decorate([
|
|
187
209
|
typedi_1.Service(constants_1.Constants.DeployDriverName)
|
|
188
210
|
], SPFxDeployDriver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/spfx/deployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAC9C,wDAAsF;AACtF,0DAA0B;AAC1B,gEAA0B;AAC1B,wDAAwB;AACxB,mCAAiC;AAEjC,oEAAsE;AACtE,oDAAqE;AACrE,qDAA6D;AAC7D,kDAAgF;AAGhF,sFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"deployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/spfx/deployDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { WrapDriverContext } from "../util/wrapUtil";
|
|
|
5
5
|
import { InstallToolArgs } from "./interfaces/InstallToolArgs";
|
|
6
6
|
export declare class ToolsInstallDriver implements StepDriver {
|
|
7
7
|
description: string;
|
|
8
|
+
readonly progressTitle: string;
|
|
8
9
|
run(args: InstallToolArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
9
10
|
execute(args: InstallToolArgs, context: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
|
|
10
11
|
_run(args: InstallToolArgs, wrapContext: WrapDriverContext, outputEnvVarNames?: Map<string, string>): Promise<Result<Map<string, string>, FxError>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAmB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;
|
|
1
|
+
{"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAmB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IACxC,QAAQ,CAAC,aAAa,SAAyD;IAEzE,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAUrB,IAAI,CACR,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAMjD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGxC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA+BzB,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqCzB,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuC1F,OAAO,CAAC,YAAY;IAuBpB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAe9B"}
|
|
@@ -19,11 +19,11 @@ const dotnetInstallationUserError_1 = require("./error/dotnetInstallationUserErr
|
|
|
19
19
|
const funcInstallationUserError_1 = require("./error/funcInstallationUserError");
|
|
20
20
|
const common_2 = require("../../../error/common");
|
|
21
21
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
22
|
-
const updateProgress_1 = require("../middleware/updateProgress");
|
|
23
22
|
const lib_1 = require("@feathersjs/hooks/lib");
|
|
24
23
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
25
24
|
const funcToolChecker_1 = require("../../../common/deps-checker/internal/funcToolChecker");
|
|
26
25
|
const dotnetChecker_1 = require("../../../common/deps-checker/internal/dotnetChecker");
|
|
26
|
+
const globalVars_1 = require("../../../core/globalVars");
|
|
27
27
|
const ACTION_NAME = "devTool/install";
|
|
28
28
|
const helpLink = "https://aka.ms/teamsfx-actions/devtool-install";
|
|
29
29
|
const outputKeys = {
|
|
@@ -35,6 +35,7 @@ const outputKeys = {
|
|
|
35
35
|
let ToolsInstallDriver = class ToolsInstallDriver {
|
|
36
36
|
constructor() {
|
|
37
37
|
this.description = constant_1.toolsInstallDescription();
|
|
38
|
+
this.progressTitle = localizeUtils_1.getLocalizedString("driver.prerequisite.progressBar");
|
|
38
39
|
}
|
|
39
40
|
async run(args, context) {
|
|
40
41
|
const wrapContext = new wrapUtil_1.WrapDriverContext(context, ACTION_NAME, ACTION_NAME);
|
|
@@ -56,10 +57,7 @@ let ToolsInstallDriver = class ToolsInstallDriver {
|
|
|
56
57
|
}
|
|
57
58
|
};
|
|
58
59
|
tslib_1.__decorate([
|
|
59
|
-
lib_1.hooks([
|
|
60
|
-
addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, ACTION_NAME),
|
|
61
|
-
updateProgress_1.updateProgress(localizeUtils_1.getLocalizedString("driver.prerequisite.progressBar")),
|
|
62
|
-
]),
|
|
60
|
+
lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, ACTION_NAME)]),
|
|
63
61
|
tslib_1.__metadata("design:type", Function),
|
|
64
62
|
tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext,
|
|
65
63
|
Map]),
|
|
@@ -96,6 +94,12 @@ class ToolsInstallDriverImpl {
|
|
|
96
94
|
// Do not print any log in LocalCertificateManager, use the error message returned instead.
|
|
97
95
|
const certManager = new localCertificateManager_1.LocalCertificateManager(this.context.ui);
|
|
98
96
|
const localCertResult = await certManager.setupCertificate(trustDevCert);
|
|
97
|
+
this.context.logProvider.debug(`Dev cert result: ${JSON.stringify({
|
|
98
|
+
cert: localCertResult.certPath,
|
|
99
|
+
key: localCertResult.keyPath,
|
|
100
|
+
alreadyTrusted: localCertResult.alreadyTrusted,
|
|
101
|
+
isTrusted: localCertResult.isTrusted,
|
|
102
|
+
})}`);
|
|
99
103
|
if (trustDevCert) {
|
|
100
104
|
let name = outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.sslCertFile);
|
|
101
105
|
if (name) {
|
|
@@ -108,7 +112,7 @@ class ToolsInstallDriverImpl {
|
|
|
108
112
|
}
|
|
109
113
|
this.setDevCertTelemetry(trustDevCert, localCertResult);
|
|
110
114
|
if (typeof localCertResult.isTrusted === "undefined") {
|
|
111
|
-
|
|
115
|
+
this.context.logProvider.warning(constant_1.Summaries.devCertSkipped());
|
|
112
116
|
this.context.addSummary(constant_1.Summaries.devCertSkipped());
|
|
113
117
|
}
|
|
114
118
|
else if (localCertResult.isTrusted === false) {
|
|
@@ -128,12 +132,18 @@ class ToolsInstallDriverImpl {
|
|
|
128
132
|
symlinkDir: symlinkDir,
|
|
129
133
|
projectPath: this.context.projectPath,
|
|
130
134
|
});
|
|
135
|
+
this.context.logProvider.debug(`Func tool result: ${JSON.stringify({
|
|
136
|
+
isInstalled: funcStatus.isInstalled,
|
|
137
|
+
version: funcStatus.details.installVersion,
|
|
138
|
+
bin: funcStatus.details.binFolders,
|
|
139
|
+
supportedVersions: funcStatus.details.supportedVersions,
|
|
140
|
+
})}`);
|
|
131
141
|
this.setDepsCheckTelemetry(constant_1.TelemetryProperties.funcStatus, funcStatus);
|
|
132
142
|
if (!funcStatus.isInstalled && funcStatus.error) {
|
|
133
143
|
throw new funcInstallationUserError_1.FuncInstallationUserError(ACTION_NAME, funcStatus.error, funcStatus.error.helpLink);
|
|
134
144
|
}
|
|
135
145
|
else if (funcStatus.error) {
|
|
136
|
-
|
|
146
|
+
this.context.logProvider.warning(funcStatus.error.message);
|
|
137
147
|
this.context.addSummary(constant_1.Summaries.funcSuccess(funcStatus.details.binFolders) + funcStatus.error.message);
|
|
138
148
|
}
|
|
139
149
|
else {
|
|
@@ -149,22 +159,28 @@ class ToolsInstallDriverImpl {
|
|
|
149
159
|
return res;
|
|
150
160
|
}
|
|
151
161
|
async resolveDotnet(outputEnvVarNames) {
|
|
152
|
-
var _a, _b, _c, _d;
|
|
162
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
153
163
|
const res = new Map();
|
|
154
164
|
const dotnetChecker = new dotnetChecker_1.DotnetChecker(new deps_checker_1.EmptyLogger(), new deps_checker_1.EmptyTelemetry());
|
|
155
165
|
const dotnetStatus = await dotnetChecker.resolve();
|
|
166
|
+
this.context.logProvider.debug(`.NET result: ${JSON.stringify({
|
|
167
|
+
isInstalled: dotnetStatus.isInstalled,
|
|
168
|
+
version: (_a = dotnetStatus.details) === null || _a === void 0 ? void 0 : _a.installVersion,
|
|
169
|
+
bin: (_b = dotnetStatus.details) === null || _b === void 0 ? void 0 : _b.binFolders,
|
|
170
|
+
supportedVersions: (_c = dotnetStatus.details) === null || _c === void 0 ? void 0 : _c.supportedVersions,
|
|
171
|
+
})}`);
|
|
156
172
|
this.setDepsCheckTelemetry(constant_1.TelemetryProperties.dotnetStatus, dotnetStatus);
|
|
157
173
|
if (!dotnetStatus.isInstalled && dotnetStatus.error) {
|
|
158
174
|
throw new dotnetInstallationUserError_1.DotnetInstallationUserError(ACTION_NAME, dotnetStatus.error, dotnetStatus.error.helpLink);
|
|
159
175
|
}
|
|
160
176
|
else if (dotnetStatus.error) {
|
|
161
|
-
|
|
162
|
-
this.context.addSummary((
|
|
177
|
+
this.context.logProvider.warning((_d = dotnetStatus.error) === null || _d === void 0 ? void 0 : _d.message);
|
|
178
|
+
this.context.addSummary((_e = dotnetStatus.error) === null || _e === void 0 ? void 0 : _e.message);
|
|
163
179
|
}
|
|
164
180
|
else {
|
|
165
|
-
this.context.addSummary(constant_1.Summaries.dotnetSuccess((
|
|
181
|
+
this.context.addSummary(constant_1.Summaries.dotnetSuccess((_f = dotnetStatus === null || dotnetStatus === void 0 ? void 0 : dotnetStatus.details) === null || _f === void 0 ? void 0 : _f.binFolders));
|
|
166
182
|
}
|
|
167
|
-
if (((
|
|
183
|
+
if (((_g = dotnetStatus === null || dotnetStatus === void 0 ? void 0 : dotnetStatus.details) === null || _g === void 0 ? void 0 : _g.binFolders) !== undefined) {
|
|
168
184
|
const dotnetBinFolder = `${dotnetStatus.details.binFolders
|
|
169
185
|
.map((f) => path.dirname(f))
|
|
170
186
|
.join(path.delimiter)}`;
|
|
@@ -237,5 +253,11 @@ class ToolsInstallDriverImpl {
|
|
|
237
253
|
}
|
|
238
254
|
}
|
|
239
255
|
}
|
|
256
|
+
tslib_1.__decorate([
|
|
257
|
+
lib_1.hooks([globalVars_1.ErrorContextMW({ source: "DevTools", component: "ToolsInstallDriverImpl" })]),
|
|
258
|
+
tslib_1.__metadata("design:type", Function),
|
|
259
|
+
tslib_1.__metadata("design:paramtypes", [Object, Map]),
|
|
260
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
261
|
+
], ToolsInstallDriverImpl.prototype, "run", null);
|
|
240
262
|
exports.ToolsInstallDriverImpl = ToolsInstallDriverImpl;
|
|
241
263
|
//# sourceMappingURL=installDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,mDAA6B;AAC7B,4DAA4B;AAC5B,mCAAiC;AAEjC,+DAA6F;AAC7F,2FAGuD;AACvD,+CAA6C;AAG7C,+CAAqD;AACrD,yCAMoB;AACpB,qFAAkF;AAClF,iFAA8E;AAE9E,kDAAgE;AAChE,mFAAgF;AAChF
|
|
1
|
+
{"version":3,"file":"installDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
|
4
4
|
import { GenerateEnvArgs } from "./interface/generateEnvArgs";
|
|
5
5
|
export declare class CreateOrUpdateEnvironmentFileDriver implements StepDriver {
|
|
6
6
|
description: string;
|
|
7
|
+
readonly progressTitle: string;
|
|
7
8
|
run(args: GenerateEnvArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
8
9
|
execute(args: GenerateEnvArgs, ctx: DriverContext): Promise<ExecutionResult>;
|
|
9
10
|
private handler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAKjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"createOrUpdateEnvironmentFile.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/file/createOrUpdateEnvironmentFile.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAKjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAM9D,qBACa,mCAAoC,YAAW,UAAU;IACpE,WAAW,SAA+E;IAC1F,QAAQ,CAAC,aAAa,SAAqD;IAG9D,GAAG,CACd,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;YAa3E,OAAO;IA2CrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,eAAe;CAKxB"}
|