@microsoft/teamsfx-core 2.0.5 → 2.0.6-beta.2023091908.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 +3 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +3 -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/constant/message.d.ts +2 -0
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +2 -0
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +12 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +11 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +7 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +1 -0
- package/build/common/deps-checker/depsChecker.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/internal/testToolChecker.d.ts +45 -0
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/testToolChecker.js +359 -0
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -0
- 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/fileHelper.d.ts +1 -0
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +9 -1
- package/build/common/deps-checker/util/fileHelper.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/featureFlags.d.ts +2 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +11 -2
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +1 -5
- package/build/common/jsonUtils.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 +66 -19
- 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 +9 -2
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +67 -22
- 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 +39 -32
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts +3 -0
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js +21 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +18 -10
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +40 -10
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +36 -24
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +13 -2
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +5 -3
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +127 -46
- 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 +28 -35
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +8 -2
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +158 -110
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +22 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +256 -21
- 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 +43 -8
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +3 -3
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +5 -0
- package/build/common/tools.js.map +1 -1
- package/build/common/versionMetadata.d.ts +1 -0
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +1 -0
- package/build/common/versionMetadata.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 +23 -51
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +4 -3
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +6 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +7 -1
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +8 -6
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +64 -65
- 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 -2
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +9 -12
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts +5 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts.map +1 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +21 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -0
- package/build/component/driver/aad/update.d.ts +1 -2
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +5 -12
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +11 -3
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +49 -8
- 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 +12 -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 +2 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +10 -9
- 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 +27 -16
- 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/constant.d.ts +2 -0
- package/build/component/driver/devTool/constant.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +4 -0
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts +5 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts.map +1 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +24 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -0
- package/build/component/driver/devTool/installDriver.d.ts +2 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +85 -14
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +8 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.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 +30 -29
- 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 +11 -8
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +11 -5
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +62 -21
- 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 +4 -3
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +53 -43
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +4 -4
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +9 -7
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +2 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts +1 -0
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.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 +2 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +22 -4
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +1 -0
- package/build/component/driver/teamsApp/utils/telemetry.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 +22 -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 +18 -13
- 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 +6 -11
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/error/componentError.d.ts.map +1 -1
- package/build/component/error/componentError.js +6 -3
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts +2 -2
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +35 -16
- 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 +73 -20
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +6 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +121 -46
- 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 +3 -3
- 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 +11 -9
- 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.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +6 -4
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +9 -4
- package/build/component/utils/pathUtils.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 +38 -34
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +843 -66
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.js +3 -3
- package/build/core/collaborator.js.map +1 -1
- package/build/core/environment.d.ts +2 -9
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +17 -13
- package/build/core/environment.js.map +1 -1
- package/build/core/environmentName.d.ts +18 -0
- package/build/core/environmentName.d.ts.map +1 -0
- package/build/core/environmentName.js +35 -0
- package/build/core/environmentName.js.map +1 -0
- 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/core/telemetry.d.ts +1 -0
- package/build/core/telemetry.d.ts.map +1 -1
- package/build/core/telemetry.js +3 -3
- package/build/core/telemetry.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +10 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts +5 -5
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +21 -5
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +8 -11
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +67 -53
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +21 -2
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +4 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +7 -2
- package/build/error/script.js.map +1 -1
- package/build/error/teamsApp.d.ts +8 -0
- package/build/error/teamsApp.d.ts.map +1 -0
- package/build/error/teamsApp.js +35 -0
- package/build/error/teamsApp.js.map +1 -0
- package/build/error/types.d.ts +6 -0
- package/build/error/types.d.ts.map +1 -0
- package/build/error/types.js +12 -0
- package/build/error/types.js.map +1 -0
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +6 -0
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +4 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +5 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +4 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +9 -3
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +25 -8
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +202 -171
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts +2 -1
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +156 -61
- package/build/question/generator.js.map +1 -1
- package/build/question/index.d.ts +1 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +1 -0
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +9 -7
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateSampleProjectInputs.d.ts +1 -1
- package/build/question/inputs/CreateSampleProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts +1 -1
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +37 -25
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +13 -2
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +2 -2
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +4 -4
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +4 -4
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/options/PreviewTeamsAppOptions.js +3 -3
- 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 +7 -6
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js +2 -2
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -1
- package/build/question/options/ValidateTeamsAppOptions.js +4 -4
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +35 -22
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +5 -3
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +7 -4
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/validationUtils.d.ts +23 -4
- package/build/ui/validationUtils.d.ts.map +1 -1
- package/build/ui/validationUtils.js +229 -16
- package/build/ui/validationUtils.js.map +1 -1
- package/build/ui/visitor.d.ts +1 -0
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +79 -166
- package/build/ui/visitor.js.map +1 -1
- package/package.json +16 -14
- package/resource/package.nls.cs.json +83 -23
- package/resource/package.nls.de.json +81 -21
- package/resource/package.nls.es.json +83 -23
- package/resource/package.nls.fr.json +82 -22
- package/resource/package.nls.it.json +82 -22
- package/resource/package.nls.ja.json +83 -23
- package/resource/package.nls.json +49 -19
- package/resource/package.nls.ko.json +82 -22
- package/resource/package.nls.pl.json +83 -23
- package/resource/package.nls.pt-BR.json +84 -24
- package/resource/package.nls.ru.json +84 -24
- package/resource/package.nls.tr.json +82 -22
- package/resource/package.nls.zh-Hans.json +82 -22
- package/resource/package.nls.zh-Hant.json +82 -22
- package/resource/package.nls.zh-cn.json +82 -22
- package/resource/package.nls.zh-tw.json +82 -22
- package/resource/yaml-schema/v1.3/yaml.schema.json +1500 -0
- 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 -49
- package/build/core/FxCoreImplementV3.d.ts.map +0 -1
- package/build/core/FxCoreImplementV3.js +0 -717
- package/build/core/FxCoreImplementV3.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,4DAA4B;AAC5B,qDAA+B;AAC/B,+BAA4B;AAC5B,iDAA+C;AAE/C,0DAA6C;AAC7C,0EAAoF;AACpF,+CAAyB;AAEzB,MAAa,KAAK;IAChB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAqB,EAAE,GAAwB;QACpE,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEjE,IAAI,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC;SACzB;aAAM;YACL,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC5B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,WAAI,CAAC,IAAI,CAAC,GAAG,aAAa,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;aAChF;SACF;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnD,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACzB,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;IACH,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,IAAY;QACxC,IAAI,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,OAAe,EACf,KAAc,EACd,UAAmB,EACnB,WAAyB,EACzB,kBAAkB,GAAG,KAAK;QAE1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,kBAAkB,EAAE;gBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,IAAI,KAAK,4BAA4B,OAAO,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/generator/spfx/utils/utils.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,4DAA4B;AAC5B,qDAA+B;AAC/B,+BAA4B;AAC5B,iDAA+C;AAE/C,0DAA6C;AAC7C,0EAAoF;AACpF,+CAAyB;AAEzB,MAAa,KAAK;IAChB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAqB,EAAE,GAAwB;QACpE,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEjE,IAAI,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,KAAK,GAAG,CAAC,aAAa,CAAC,CAAC;SACzB;aAAM;YACL,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;gBAC5B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,WAAI,CAAC,IAAI,CAAC,GAAG,aAAa,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;aAChF;SACF;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnD,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACzB,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;IACH,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,IAAY;QACxC,IAAI,GAAG,gBAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,OAAe,EACf,KAAc,EACd,UAAmB,EACnB,WAAyB,EACzB,kBAAkB,GAAG,KAAK;QAE1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,kBAAkB,EAAE;gBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,4BAA4B,OAAO,IAAI,CAAC,CAAC;aAC3E;YAED,oBAAI,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;gBAC3D,IAAI,kBAAkB,EAAE;oBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,cAAc,EAAE,CAAC,CAAC;iBACzD;gBACD,IAAI,KAAK,EAAE;oBACT,IAAI,kBAAkB,EAAE;wBACtB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,6BAA6B,OAAO,IAAI,CAAC,CAAC;wBAC5E,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;qBACnC;oBACD,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;iBACR;gBACD,OAAO,CAAC,cAAc,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,4BAA4B,CAAC,WAAmB;QACrD,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;YACjC,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,WAAW,EAAE;aACvC;SACF,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,iBAAiB,CAAC,OAAe;QACtC,IAAI;YACF,MAAM,MAAM,GAAG,wBAAQ,CAAC,YAAY,OAAO,eAAe,CAAC,CAAC;YAE5D,MAAM,KAAK,GAAG,+DAA+D,CAAC;YAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;aAC7B;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAA+B;QACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtD,OAAO,OAAO,KAAK,SAAS,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAA+B;QAC7D,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,MAAM,EACN,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,KAAK,EACL,WAAW,CACZ,CAAC;YAEF,MAAM,KAAK,GAAG,kCAAkC,CAAC;YACjD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC;aAClC;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc;QACzB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,SAAS,EACT,SAAS,EACT,MAAM,EACN,WAAW,CACZ,CAAC;YAEF,MAAM,KAAK,GAAG,wEAAwE,CAAC;YACvF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC;aACnC;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,4BAA4B,CACvC,MAA+B,EAC/B,WAAmB,EACnB,gBAAwB,EACxB,qBAAqB,GAAG,IAAI;QAE5B,MAAM,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAAC;QACxC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,MAAM,EACN,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAClC,cAAc,CAAC,KAAK,CAAC,EACrB,IAAI,EACJ,GAAG,WAAW,EAAE,EAChB,IAAI,EACJ,WAAW,CACZ,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,GAAG,GAAG,GAAG,wCAAwC,CAAC,CAAC,CAAC,uDAAuD;YAC/I,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;aAC7B;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,6BAA6B,WAAW,GAAG,CAAC,CAAC;YAC3D,IAAI,qBAAqB,EAAE;gBACzB,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAC5B,MAA+B,EAC/B,WAAmB,EACnB,gBAAwB;QAExB,MAAM,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAAC;QACxC,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,MAAM,EACN,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAClC,cAAc,CAAC,KAAK,CAAC,EACrB,MAAM,EACN,GAAG,WAAW,EAAE,EAChB,SAAS,CACV,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE5C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;gBACzB,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;aAC7B;iBAAM;gBACL,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAnMD,sBAmMC;AAED,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,SAAS,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAClD,CAAC;AAFD,wCAEC;AAED,SAAS,SAAS;IAChB,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,YAAY,CAAC;AACpC,CAAC"}
|
|
@@ -6,7 +6,7 @@ export declare function sendRequestWithRetry<T>(requestFn: () => Promise<AxiosRe
|
|
|
6
6
|
export declare function sendRequestWithTimeout<T>(requestFn: (cancelToken: CancelToken) => Promise<AxiosResponse<T>>, timeoutInMs: number, tryLimits?: number): Promise<AxiosResponse<T>>;
|
|
7
7
|
export declare function fetchTemplateZipUrl(name: string, tryLimits?: number, timeoutInMs?: number): Promise<string>;
|
|
8
8
|
export declare function fetchZipFromUrl(url: string, tryLimits?: number, timeoutInMs?: number): Promise<AdmZip>;
|
|
9
|
-
export declare function unzip(zip: AdmZip, dstPath: string, nameReplaceFn?: (filePath: string, data: Buffer) => string, dataReplaceFn?: (filePath: string, data: Buffer) => Buffer | string,
|
|
9
|
+
export declare function unzip(zip: AdmZip, dstPath: string, nameReplaceFn?: (filePath: string, data: Buffer) => string, dataReplaceFn?: (filePath: string, data: Buffer) => Buffer | string, filterFn?: (filePath: string) => boolean): Promise<string[]>;
|
|
10
10
|
export declare function renderTemplateFileData(fileName: string, fileData: Buffer, variables?: {
|
|
11
11
|
[key: string]: string;
|
|
12
12
|
}): string | Buffer;
|
|
@@ -15,7 +15,7 @@ export declare function renderTemplateFileName(fileName: string, fileData: Buffe
|
|
|
15
15
|
}): string;
|
|
16
16
|
export declare function getSampleInfoFromName(sampleName: string): SampleConfig;
|
|
17
17
|
export declare function zipFolder(folderPath: string): AdmZip;
|
|
18
|
-
export declare function downloadDirectory(sampleUrl: string, dstPath: string, concurrencyLimits?: number, retryLimits?: number): Promise<
|
|
18
|
+
export declare function downloadDirectory(sampleUrl: string, dstPath: string, concurrencyLimits?: number, retryLimits?: number): Promise<string[]>;
|
|
19
19
|
declare type SampleUrlInfo = {
|
|
20
20
|
owner: string;
|
|
21
21
|
repository: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,YAAY,EAAkB,MAAM,sBAAsB,CAAC;AACpE,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAyB1D,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwB3B;AAED,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,SAAS,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClE,WAAW,EAAE,MAAM,EACnB,SAAS,SAAI,GACZ,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAe3B;AAeD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAUjB;AAGD,wBAAsB,KAAK,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,EAC1D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,EACnE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,YAAY,EAAkB,MAAM,sBAAsB,CAAC;AACpE,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAyB1D,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwB3B;AAED,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,SAAS,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClE,WAAW,EAAE,MAAM,EACnB,SAAS,SAAI,GACZ,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAe3B;AAeD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,SAAS,SAAmB,EAC5B,WAAW,SAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAUjB;AAGD,wBAAsB,KAAK,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,EAC1D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,EACnE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,GACvC,OAAO,CAAC,MAAM,EAAE,CAAC,CAsBnB;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpC,MAAM,GAAG,MAAM,CAWjB;AAyBD,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpC,MAAM,CAKR;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,YAAY,CAQtE;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAIpD;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,iBAAiB,SAA0B,EAC3C,WAAW,SAA2B,GACrC,OAAO,CAAC,MAAM,EAAE,CAAC,CAYnB;AAED,aAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAUF,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAMzD;AAoCD,wBAAsB,yBAAyB,CAAC,CAAC,EAC/C,KAAK,EAAE,CAAC,EAAE,EACV,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,GAAG,EACzB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAapE"}
|
|
@@ -15,6 +15,7 @@ const templates_config_json_1 = tslib_1.__importDefault(require("../../common/te
|
|
|
15
15
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
16
16
|
const error_1 = require("./error");
|
|
17
17
|
const tools_1 = require("../../common/tools");
|
|
18
|
+
const error_2 = require("../../core/error");
|
|
18
19
|
async function selectTemplateTag(getTags) {
|
|
19
20
|
const preRelease = process.env.TEAMSFX_TEMPLATE_PRERELEASE
|
|
20
21
|
? `0.0.0-${process.env.TEAMSFX_TEMPLATE_PRERELEASE}`
|
|
@@ -103,19 +104,17 @@ async function fetchZipFromUrl(url, tryLimits = constant_1.defaultTryLimits, tim
|
|
|
103
104
|
}
|
|
104
105
|
exports.fetchZipFromUrl = fetchZipFromUrl;
|
|
105
106
|
/* The unzip used for scaffold which would drop the attr of the files and dirs. */
|
|
106
|
-
async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn,
|
|
107
|
+
async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, filterFn) {
|
|
108
|
+
const output = [];
|
|
107
109
|
let entries = zip.getEntries().filter((entry) => !entry.isDirectory);
|
|
108
|
-
if (
|
|
109
|
-
entries = entries.filter((entry) => entry.entryName
|
|
110
|
+
if (filterFn) {
|
|
111
|
+
entries = entries.filter((entry) => filterFn(entry.entryName));
|
|
110
112
|
}
|
|
111
113
|
for (const entry of entries) {
|
|
112
114
|
const rawEntryData = entry.getData();
|
|
113
|
-
|
|
115
|
+
const entryName = nameReplaceFn
|
|
114
116
|
? nameReplaceFn(entry.entryName, rawEntryData)
|
|
115
117
|
: entry.entryName;
|
|
116
|
-
if (relativePath) {
|
|
117
|
-
entryName = entryName.replace(relativePath, "");
|
|
118
|
-
}
|
|
119
118
|
const entryData = dataReplaceFn
|
|
120
119
|
? dataReplaceFn(entry.name, rawEntryData)
|
|
121
120
|
: rawEntryData;
|
|
@@ -123,7 +122,9 @@ async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, relativePath) {
|
|
|
123
122
|
const dirPath = path_1.default.dirname(filePath);
|
|
124
123
|
await fs.ensureDir(dirPath);
|
|
125
124
|
await fs.writeFile(filePath, entryData);
|
|
125
|
+
output.push(entryName);
|
|
126
126
|
}
|
|
127
|
+
return output;
|
|
127
128
|
}
|
|
128
129
|
exports.unzip = unzip;
|
|
129
130
|
function renderTemplateFileData(fileName, fileData, variables) {
|
|
@@ -164,7 +165,7 @@ exports.renderTemplateFileName = renderTemplateFileName;
|
|
|
164
165
|
function getSampleInfoFromName(sampleName) {
|
|
165
166
|
const sample = samples_1.sampleProvider.SampleCollection.samples.find((sample) => sample.id.toLowerCase() === sampleName.toLowerCase());
|
|
166
167
|
if (!sample) {
|
|
167
|
-
throw
|
|
168
|
+
throw error_2.InvalidInputError(`sample '${sampleName}' not found`);
|
|
168
169
|
}
|
|
169
170
|
return sample;
|
|
170
171
|
}
|
|
@@ -179,6 +180,7 @@ async function downloadDirectory(sampleUrl, dstPath, concurrencyLimits = constan
|
|
|
179
180
|
const urlInfo = parseSampleUrl(sampleUrl);
|
|
180
181
|
const { samplePaths, fileUrlPrefix } = await getSampleFileInfo(urlInfo, retryLimits);
|
|
181
182
|
await downloadSampleFiles(fileUrlPrefix, samplePaths, dstPath, urlInfo.dir, retryLimits, concurrencyLimits);
|
|
183
|
+
return samplePaths;
|
|
182
184
|
}
|
|
183
185
|
exports.downloadDirectory = downloadDirectory;
|
|
184
186
|
function parseSampleUrl(url) {
|
|
@@ -191,15 +193,13 @@ function parseSampleUrl(url) {
|
|
|
191
193
|
}
|
|
192
194
|
exports.parseSampleUrl = parseSampleUrl;
|
|
193
195
|
async function getSampleFileInfo(urlInfo, retryLimits) {
|
|
196
|
+
var _a;
|
|
194
197
|
const fileInfoUrl = `https://api.github.com/repos/${urlInfo.owner}/${urlInfo.repository}/git/trees/${urlInfo.ref}?recursive=1`;
|
|
195
198
|
const fileInfo = (await sendRequestWithRetry(async () => {
|
|
196
199
|
return await axios_1.default.get(fileInfoUrl);
|
|
197
200
|
}, retryLimits)).data;
|
|
198
|
-
const
|
|
199
|
-
const
|
|
200
|
-
.filter((node) => node.path.startsWith(`${urlInfo.dir}/`) && node.type !== "tree")
|
|
201
|
-
.map((node) => node.path);
|
|
202
|
-
const fileUrlPrefix = `https://raw.githubusercontent.com/${urlInfo.owner}/${urlInfo.repository}/${fileInfo.sha}/`;
|
|
201
|
+
const samplePaths = (_a = fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.tree) === null || _a === void 0 ? void 0 : _a.filter((node) => node.path.startsWith(`${urlInfo.dir}/`) && node.type !== "tree").map((node) => node.path);
|
|
202
|
+
const fileUrlPrefix = `https://raw.githubusercontent.com/${urlInfo.owner}/${urlInfo.repository}/${fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.sha}/`;
|
|
203
203
|
return { samplePaths, fileUrlPrefix };
|
|
204
204
|
}
|
|
205
205
|
async function downloadSampleFiles(fileUrlPrefix, samplePaths, dstPath, relativePath, retryLimits, concurrencyLimits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6DAAqD;AACrD,wDAAwB;AACxB,qDAA+B;AAC/B,yCAQoB;AACpB,kDAAoE;AACpE,8DAA6B;AAC7B,0DAA0D;AAC1D,uGAAgE;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
export declare class ProgressTitles {
|
|
2
|
-
static readonly
|
|
3
|
-
static readonly generateSample: string;
|
|
2
|
+
static readonly create: string;
|
|
4
3
|
}
|
|
5
4
|
export declare class ProgressMessages {
|
|
6
|
-
static readonly generateTemplate:
|
|
5
|
+
static readonly generateTemplate: string;
|
|
7
6
|
static readonly generateSample: (sampleName: string) => string;
|
|
8
7
|
static readonly configureAzureStorageEnableStaticWebsite: string;
|
|
9
8
|
static readonly runCommand: (command: string, directory: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":"AAKA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":"AAKA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,SAA8C;CACrE;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAA0D;IAC1F,MAAM,CAAC,QAAQ,CAAC,cAAc,eAAgB,MAAM,KAAG,MAAM,CACM;IACnE,MAAM,CAAC,QAAQ,CAAC,wCAAwC,SAEtD;IACF,MAAM,CAAC,QAAQ,CAAC,UAAU,YAAa,MAAM,aAAa,MAAM,KAAG,MAAM,CACJ;IACrE,MAAM,CAAC,QAAQ,CAAC,aAAa,aAAc,MAAM,QAAQ,MAAM,KAAG,MAAM,CACJ;CACrE;AAED,qBAAa,WAAW;IACtB,gBAAuB,oBAAoB,SAEzC;CACH"}
|
|
@@ -7,13 +7,12 @@ const localizeUtils_1 = require("../common/localizeUtils");
|
|
|
7
7
|
class ProgressTitles {
|
|
8
8
|
}
|
|
9
9
|
exports.ProgressTitles = ProgressTitles;
|
|
10
|
-
ProgressTitles.
|
|
11
|
-
ProgressTitles.generateSample = localizeUtils_1.getLocalizedString("core.progress.generateSample");
|
|
10
|
+
ProgressTitles.create = localizeUtils_1.getLocalizedString("core.progress.create");
|
|
12
11
|
class ProgressMessages {
|
|
13
12
|
}
|
|
14
13
|
exports.ProgressMessages = ProgressMessages;
|
|
15
|
-
ProgressMessages.generateTemplate =
|
|
16
|
-
ProgressMessages.generateSample = (sampleName) => localizeUtils_1.getLocalizedString("core.progress.
|
|
14
|
+
ProgressMessages.generateTemplate = localizeUtils_1.getLocalizedString("core.progress.createFromTemplate");
|
|
15
|
+
ProgressMessages.generateSample = (sampleName) => localizeUtils_1.getLocalizedString("core.progress.createFromSample", sampleName);
|
|
17
16
|
ProgressMessages.configureAzureStorageEnableStaticWebsite = localizeUtils_1.getLocalizedString("core.progress.configureAzureStorage");
|
|
18
17
|
ProgressMessages.runCommand = (command, directory) => localizeUtils_1.getLocalizedString("core.progress.runCommand", command, directory);
|
|
19
18
|
ProgressMessages.deployToAzure = (location, dist) => localizeUtils_1.getLocalizedString("core.progress.deployToAzure", location, dist);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2DAA6D;AAE7D,MAAa,cAAc;;AAA3B,
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2DAA6D;AAE7D,MAAa,cAAc;;AAA3B,wCAEC;AADiB,qBAAM,GAAG,kCAAkB,CAAC,sBAAsB,CAAC,CAAC;AAGtE,MAAa,gBAAgB;;AAA7B,4CAWC;AAViB,iCAAgB,GAAG,kCAAkB,CAAC,kCAAkC,CAAC,CAAC;AAC1E,+BAAc,GAAG,CAAC,UAAkB,EAAU,EAAE,CAC9D,kCAAkB,CAAC,gCAAgC,EAAE,UAAU,CAAC,CAAC;AACnD,yDAAwC,GAAG,kCAAkB,CAC3E,qCAAqC,CACtC,CAAC;AACc,2BAAU,GAAG,CAAC,OAAe,EAAE,SAAiB,EAAU,EAAE,CAC1E,kCAAkB,CAAC,0BAA0B,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AACrD,8BAAa,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAU,EAAE,CACzE,kCAAkB,CAAC,6BAA6B,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAGtE,MAAa,WAAW;;AAAxB,kCAIC;AAHwB,gCAAoB,GAAG,kCAAkB,CAC9D,uCAAuC,CACxC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Middleware } from "@feathersjs/hooks/lib";
|
|
2
|
-
import { Context, FxError, IProgressHandler, InputsWithProjectPath, MaybePromise,
|
|
2
|
+
import { Context, FxError, IProgressHandler, InputsWithProjectPath, MaybePromise, IQTreeNode, Result } from "@microsoft/teamsfx-api";
|
|
3
3
|
interface ActionOption {
|
|
4
4
|
componentName?: string;
|
|
5
5
|
errorSource?: string;
|
|
@@ -12,7 +12,7 @@ interface ActionOption {
|
|
|
12
12
|
enableProgressBar?: boolean;
|
|
13
13
|
progressTitle?: string;
|
|
14
14
|
progressSteps?: number;
|
|
15
|
-
question?: (context: Context, inputs: InputsWithProjectPath) => MaybePromise<Result<
|
|
15
|
+
question?: (context: Context, inputs: InputsWithProjectPath) => MaybePromise<Result<IQTreeNode | undefined, FxError>>;
|
|
16
16
|
}
|
|
17
17
|
export interface ActionContext {
|
|
18
18
|
progressBar?: IProgressHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actionExecutionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"actionExecutionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,UAAU,EACV,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAUhC,UAAU,YAAY;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CACT,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,qBAAqB,KAC1B,YAAY,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;CAC5D;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AACD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAwFlE"}
|
|
@@ -4,7 +4,7 @@ exports.EnvWriterMW = exports.EnvLoaderMW = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
6
6
|
const lodash_1 = tslib_1.__importDefault(require("lodash"));
|
|
7
|
-
const
|
|
7
|
+
const environmentName_1 = require("../../core/environmentName");
|
|
8
8
|
const error_1 = require("../../core/error");
|
|
9
9
|
const globalVars_1 = require("../../core/globalVars");
|
|
10
10
|
const questionNames_1 = require("../../question/questionNames");
|
|
@@ -46,7 +46,7 @@ const envLoaderMWImpl = async (withLocalEnv, ctx, next, skipLoadIfNoEnvInput = f
|
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
if (inputs.ignoreEnvInfo) {
|
|
49
|
-
inputs.env =
|
|
49
|
+
inputs.env = environmentName_1.environmentNameManager.getDefaultEnvName();
|
|
50
50
|
}
|
|
51
51
|
if (!inputs.env) {
|
|
52
52
|
if (skipLoadIfNoEnvInput) {
|
|
@@ -56,7 +56,7 @@ const envLoaderMWImpl = async (withLocalEnv, ctx, next, skipLoadIfNoEnvInput = f
|
|
|
56
56
|
const question = other_1.selectTargetEnvQuestion(questionNames_1.QuestionNames.Env, !withLocalEnv, true);
|
|
57
57
|
const res = await visitor_1.traverse({ data: question }, inputs, globalVars_1.TOOLS.ui);
|
|
58
58
|
if (res.isErr()) {
|
|
59
|
-
globalVars_1.TOOLS.logProvider.debug(`
|
|
59
|
+
globalVars_1.TOOLS.logProvider.debug(`Failed to run question model for target environment.`);
|
|
60
60
|
ctx.result = teamsfx_api_1.err(res.error);
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":";;;;AAGA,wDAAqD;AACrD,4DAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AzureAccountProvider, FxError, M365TokenProvider, Result, SubscriptionInfo } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { AzureAccountProvider, FxError, InputsWithProjectPath, M365TokenProvider, Result, SubscriptionInfo } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DriverContext } from "./driver/interface/commonArgs";
|
|
3
3
|
import { ResourceGroupInfo } from "./utils/ResourceGroupHelper";
|
|
4
4
|
export interface M365TenantRes {
|
|
@@ -11,10 +11,10 @@ declare class ProvisionUtils {
|
|
|
11
11
|
* subscriptionId is provided from .env.xxx file
|
|
12
12
|
*/
|
|
13
13
|
ensureSubscription(azureAccountProvider: AzureAccountProvider, givenSubscriptionId?: string): Promise<Result<SubscriptionInfo, FxError>>;
|
|
14
|
-
ensureResourceGroup(azureAccountProvider: AzureAccountProvider, subscriptionId: string, givenResourceGroupName?: string, defaultResourceGroupName?: string): Promise<Result<ResourceGroupInfo, FxError>>;
|
|
14
|
+
ensureResourceGroup(inputs: InputsWithProjectPath, azureAccountProvider: AzureAccountProvider, subscriptionId: string, givenResourceGroupName?: string, defaultResourceGroupName?: string): Promise<Result<ResourceGroupInfo, FxError>>;
|
|
15
15
|
getM365TenantId(m365TokenProvider: M365TokenProvider): Promise<Result<M365TenantRes, FxError>>;
|
|
16
16
|
askForProvisionConsentV3(ctx: DriverContext, m365tenant: M365TenantRes | undefined, azureSubInfo: SubscriptionInfo, envName: string | undefined): Promise<Result<undefined, FxError>>;
|
|
17
|
-
ensureM365TenantMatchesV3(actions: string[], tenantId: string | undefined):
|
|
17
|
+
ensureM365TenantMatchesV3(actions: string[], tenantId: string | undefined): Result<undefined, FxError>;
|
|
18
18
|
}
|
|
19
19
|
export declare const provisionUtils: ProvisionUtils;
|
|
20
20
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAuB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrF,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,cAAM,cAAc;IAClB;;;OAGG;IACG,kBAAkB,CACtB,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAkCvC,mBAAmB,CACvB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"provisionUtils.d.ts","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EACN,gBAAgB,EAEjB,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAuB,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrF,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,cAAM,cAAc;IAClB;;;OAGG;IACG,kBAAkB,CACtB,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAkCvC,mBAAmB,CACvB,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM,EAC/B,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAoCxC,eAAe,CACnB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAwBpC,wBAAwB,CAC5B,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,aAAa,GAAG,SAAS,EACrC,YAAY,EAAE,gBAAgB,EAC9B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA8CtC,yBAAyB,CACvB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;CA0B9B;AASD,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
|
|
@@ -53,7 +53,7 @@ class ProvisionUtils {
|
|
|
53
53
|
globalVars_1.TOOLS.logProvider.info("subscription validate success");
|
|
54
54
|
return teamsfx_api_1.ok(foundSubscriptionInfo);
|
|
55
55
|
}
|
|
56
|
-
async ensureResourceGroup(azureAccountProvider, subscriptionId, givenResourceGroupName, defaultResourceGroupName) {
|
|
56
|
+
async ensureResourceGroup(inputs, azureAccountProvider, subscriptionId, givenResourceGroupName, defaultResourceGroupName) {
|
|
57
57
|
const azureToken = await azureAccountProvider.getIdentityCredentialAsync();
|
|
58
58
|
if (azureToken === undefined) {
|
|
59
59
|
return teamsfx_api_1.err(new azure_1.InvalidAzureCredentialError());
|
|
@@ -77,7 +77,7 @@ class ProvisionUtils {
|
|
|
77
77
|
}
|
|
78
78
|
else {
|
|
79
79
|
const defaultRG = defaultResourceGroupName || "teams-app-rg";
|
|
80
|
-
const rgRes = await ResourceGroupHelper_1.resourceGroupHelper.askResourceGroupInfoV3(azureAccountProvider, rmClient, defaultRG);
|
|
80
|
+
const rgRes = await ResourceGroupHelper_1.resourceGroupHelper.askResourceGroupInfoV3(inputs, azureAccountProvider, rmClient, defaultRG);
|
|
81
81
|
if (rgRes.isErr())
|
|
82
82
|
return teamsfx_api_1.err(rgRes.error);
|
|
83
83
|
resourceGroupInfo = rgRes.value;
|
|
@@ -136,7 +136,7 @@ class ProvisionUtils {
|
|
|
136
136
|
}
|
|
137
137
|
return teamsfx_api_1.ok(undefined);
|
|
138
138
|
}
|
|
139
|
-
|
|
139
|
+
ensureM365TenantMatchesV3(actions, tenantId) {
|
|
140
140
|
if (actions.length === 0 || !tenantId) {
|
|
141
141
|
return teamsfx_api_1.ok(undefined);
|
|
142
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAkB,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAoB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAkB,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAoB,MAAM,OAAO,CAAC;AAoCxD,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,OAAO,CAA0B;WAElC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa;IAqBlE;;;OAGG;WACW,SAAS,CAAC,MAAM,EAAE,MAAM;WAIlB,kBAAkB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;WAqBpB,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,gBAAgB,EAC9B,cAAc,UAAO,EACrB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;WA4BI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WAgBI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
|
|
@@ -18,6 +18,8 @@ const errors_1 = require("../errors");
|
|
|
18
18
|
const messages_1 = require("../messages");
|
|
19
19
|
const retryHandler_1 = require("../retryHandler");
|
|
20
20
|
const strings_1 = require("../strings");
|
|
21
|
+
const globalVars_1 = require("../../../../core/globalVars");
|
|
22
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
21
23
|
function handleBotFrameworkError(e, apiName) {
|
|
22
24
|
var _a, _b, _c, _d;
|
|
23
25
|
if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === commonConstant_1.HttpStatusCode.NOTFOUND) {
|
|
@@ -124,7 +126,9 @@ class AppStudioClient {
|
|
|
124
126
|
appStudioClient_1.AppStudioClient.sendStartEvent(constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT);
|
|
125
127
|
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
126
128
|
try {
|
|
127
|
-
const response = await retryHandler_1.RetryHandler.Retry(() =>
|
|
129
|
+
const response = await retryHandler_1.RetryHandler.Retry(() =>
|
|
130
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
131
|
+
axiosInstance.post(`${AppStudioClient.baseUrl}/api/botframework/${botReg.botId}`, botReg));
|
|
128
132
|
if (!common_1.isHappyResponse(response)) {
|
|
129
133
|
throw new errors_1.ConfigUpdatingError(strings_1.ConfigNames.MESSAGE_ENDPOINT);
|
|
130
134
|
}
|
|
@@ -136,6 +140,24 @@ class AppStudioClient {
|
|
|
136
140
|
return;
|
|
137
141
|
}
|
|
138
142
|
}
|
|
139
|
-
exports.AppStudioClient = AppStudioClient;
|
|
140
143
|
AppStudioClient.baseUrl = constants_1.getAppStudioEndpoint();
|
|
144
|
+
tslib_1.__decorate([
|
|
145
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Teams", component: "AppStudioClient" })]),
|
|
146
|
+
tslib_1.__metadata("design:type", Function),
|
|
147
|
+
tslib_1.__metadata("design:paramtypes", [String, String]),
|
|
148
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
149
|
+
], AppStudioClient, "getBotRegistration", null);
|
|
150
|
+
tslib_1.__decorate([
|
|
151
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Teams", component: "AppStudioClient" })]),
|
|
152
|
+
tslib_1.__metadata("design:type", Function),
|
|
153
|
+
tslib_1.__metadata("design:paramtypes", [String, Object, Object, Object]),
|
|
154
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
155
|
+
], AppStudioClient, "createBotRegistration", null);
|
|
156
|
+
tslib_1.__decorate([
|
|
157
|
+
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Teams", component: "AppStudioClient" })]),
|
|
158
|
+
tslib_1.__metadata("design:type", Function),
|
|
159
|
+
tslib_1.__metadata("design:paramtypes", [String, Object]),
|
|
160
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
161
|
+
], AppStudioClient, "updateBotRegistration", null);
|
|
162
|
+
exports.AppStudioClient = AppStudioClient;
|
|
141
163
|
//# sourceMappingURL=appStudioClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,oEAAiF;AAGjF,0DAAwD;AACxD,qEAAkE;AAClE,sFAAgG;AAChG,kEAAgG;AAChG,sCAA4C;AAC5C,4CAA+C;AAC/C,sCAQmB;AACnB,0CAAuC;AACvC,kDAA+C;AAC/C,wCAAwD;
|
|
1
|
+
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
3
3
|
*/
|
|
4
4
|
import { IBotRegistration } from "../appStudio/interfaces/IBotRegistration";
|
|
5
|
-
import { FxError, Result, M365TokenProvider } from "@microsoft/teamsfx-api";
|
|
6
|
-
export declare function createOrUpdateBotRegistration(m365TokenProvider: M365TokenProvider, botRegistration: IBotRegistration): Promise<Result<boolean, FxError>>;
|
|
5
|
+
import { FxError, Result, M365TokenProvider, LogProvider } from "@microsoft/teamsfx-api";
|
|
6
|
+
export declare function createOrUpdateBotRegistration(m365TokenProvider: M365TokenProvider, botRegistration: IBotRegistration, logger?: LogProvider): Promise<Result<boolean, FxError>>;
|
|
7
7
|
//# sourceMappingURL=botFrameworkRegistration.d.ts.map
|
package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAO,OAAO,EAAE,MAAM,EAAM,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAO,OAAO,EAAE,MAAM,EAAM,iBAAiB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKlG,wBAAsB,6BAA6B,CACjD,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,gBAAgB,EACjC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAkCnC"}
|
|
@@ -7,7 +7,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
7
7
|
const tools_1 = require("../../../../common/tools");
|
|
8
8
|
const appStudioClient_1 = require("../appStudio/appStudioClient");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
|
-
async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration) {
|
|
10
|
+
async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration, logger) {
|
|
11
11
|
// 1. Get bot registration from remote.
|
|
12
12
|
// 2. If Not Found, Then create a new bot registration.
|
|
13
13
|
// 3. Else:
|
|
@@ -20,14 +20,19 @@ async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration)
|
|
|
20
20
|
return teamsfx_api_1.err(appStudioTokenRes.error);
|
|
21
21
|
}
|
|
22
22
|
const appStudioToken = appStudioTokenRes.value;
|
|
23
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Input bot registration: ${JSON.stringify(botRegistration)}`);
|
|
23
24
|
const remoteBotRegistration = await appStudioClient_1.AppStudioClient.getBotRegistration(appStudioToken, botRegistration.botId);
|
|
24
25
|
if (!remoteBotRegistration) {
|
|
25
26
|
// Not Found case.
|
|
27
|
+
logger === null || logger === void 0 ? void 0 : logger.verbose("Bot registration not found, create a new one.");
|
|
26
28
|
await appStudioClient_1.AppStudioClient.createBotRegistration(appStudioToken, botRegistration, false);
|
|
27
29
|
}
|
|
28
30
|
else {
|
|
29
31
|
// Update bot registration.
|
|
32
|
+
logger === null || logger === void 0 ? void 0 : logger.verbose("Bot registration found, update it.");
|
|
33
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Existing bot registration: ${JSON.stringify(remoteBotRegistration)}`);
|
|
30
34
|
const mergedBotRegistration = utils_1.Utils.mergeIBotRegistration(botRegistration, remoteBotRegistration);
|
|
35
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Merged bot registration: ${JSON.stringify(mergedBotRegistration)}`);
|
|
31
36
|
await appStudioClient_1.AppStudioClient.updateBotRegistration(appStudioToken, mergedBotRegistration);
|
|
32
37
|
}
|
|
33
38
|
return teamsfx_api_1.ok(remoteBotRegistration !== undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,wDAAkG;AAClG,oDAA2D;AAC3D,kEAA+D;AAC/D,mCAAgC;AAEzB,KAAK,UAAU,6BAA6B,CACjD,iBAAoC,EACpC,eAAiC,EACjC,MAAoB;IAEpB,uCAAuC;IACvC,uDAAuD;IACvD,WAAW;IACX,2EAA2E;IAC3E,oCAAoC;IACpC,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC/D,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACrC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;IAC/C,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,MAAM,iCAAe,CAAC,kBAAkB,CACpE,cAAc,EACd,eAAe,CAAC,KAAM,CACvB,CAAC;IACF,IAAI,CAAC,qBAAqB,EAAE;QAC1B,kBAAkB;QAClB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,+CAA+C,CAAC,CAAC;QACjE,MAAM,iCAAe,CAAC,qBAAqB,CAAC,cAAc,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;KACrF;SAAM;QACL,2BAA2B;QAC3B,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACtD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,qBAAqB,GAAG,aAAK,CAAC,qBAAqB,CACvD,eAAe,EACf,qBAAqB,CACtB,CAAC;QACF,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACnF,MAAM,iCAAe,CAAC,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;KACpF;IACD,OAAO,gBAAE,CAAC,qBAAqB,KAAK,SAAS,CAAC,CAAC;AACjD,CAAC;AAtCD,sEAsCC"}
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.sendErrorEvent = exports.sendSuccessEvent = exports.sendStartEvent = void 0;
|
|
6
6
|
const globalVars_1 = require("../core/globalVars");
|
|
7
|
-
const common_1 = require("../error/common");
|
|
8
7
|
const constants_1 = require("./constants");
|
|
8
|
+
const telemetry_1 = require("../common/telemetry");
|
|
9
9
|
function getCommonProperties() {
|
|
10
10
|
const props = {
|
|
11
11
|
[constants_1.TelemetryConstants.properties.appId]: globalVars_1.globalVars.teamsAppId,
|
|
@@ -28,7 +28,7 @@ exports.sendSuccessEvent = sendSuccessEvent;
|
|
|
28
28
|
function sendErrorEvent(eventName, error, properties, measurements) {
|
|
29
29
|
var _a;
|
|
30
30
|
const props = Object.assign(Object.assign({}, getCommonProperties()), properties);
|
|
31
|
-
|
|
31
|
+
telemetry_1.fillInTelemetryPropsForFxError(props, error);
|
|
32
32
|
(_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, props, measurements !== null && measurements !== void 0 ? measurements : {}, [
|
|
33
33
|
constants_1.TelemetryConstants.properties.errorMessage,
|
|
34
34
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/component/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,mDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/component/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,mDAAuD;AACvD,2CAAiD;AACjD,mDAAqE;AAGrE,SAAS,mBAAmB;IAC1B,MAAM,KAAK,GAAG;QACZ,CAAC,8BAAkB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,uBAAU,CAAC,UAAU;QAC5D,CAAC,8BAAkB,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,uBAAU,CAAC,YAAY;KAClE,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,cAAc,CAC5B,SAAiB,EACjB,UAA2B,EAC3B,YAAwC;;IAExC,MAAM,KAAK,mCACN,mBAAmB,EAAE,GACrB,UAAU,CACd,CAAC;IACF,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,GAAG,QAAQ,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;AAC/F,CAAC;AAVD,wCAUC;AAED,SAAgB,gBAAgB,CAC9B,SAAiB,EACjB,UAA2B,EAC3B,YAAwC;;IAExC,MAAM,KAAK,iDACN,mBAAmB,EAAE,GACrB,UAAU,KACb,CAAC,8BAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,8BAAkB,CAAC,MAAM,CAAC,GAAG,GACvE,CAAC;IACF,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;AACpF,CAAC;AAXD,4CAWC;AAED,SAAgB,cAAc,CAC5B,SAAiB,EACjB,KAAc,EACd,UAA2B,EAC3B,YAAwC;;IAExC,MAAM,KAAK,mCACN,mBAAmB,EAAE,GACrB,UAAU,CACd,CAAC;IACF,0CAA8B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAA,kBAAK,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,EAAE;QACrF,8BAAkB,CAAC,UAAU,CAAC,YAAY;KAC3C,CAAC,CAAC;AACL,CAAC;AAdD,wCAcC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ResourceManagementClient } from "@azure/arm-resources";
|
|
2
|
-
import { AzureAccountProvider, FxError, Result } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { AzureAccountProvider, FxError, InputsWithProjectPath, Result } from "@microsoft/teamsfx-api";
|
|
3
3
|
export declare type ResourceGroupInfo = {
|
|
4
4
|
createNewResourceGroup: boolean;
|
|
5
5
|
name: string;
|
|
@@ -14,7 +14,7 @@ declare class ResourceGroupHelper {
|
|
|
14
14
|
/**
|
|
15
15
|
* Ask user to create a new resource group or use an existing resource group V3
|
|
16
16
|
*/
|
|
17
|
-
askResourceGroupInfoV3(azureAccountProvider: AzureAccountProvider, rmClient: ResourceManagementClient, defaultResourceGroupName: string): Promise<Result<ResourceGroupInfo, FxError>>;
|
|
17
|
+
askResourceGroupInfoV3(inputs: InputsWithProjectPath, azureAccountProvider: AzureAccountProvider, rmClient: ResourceManagementClient, defaultResourceGroupName: string): Promise<Result<ResourceGroupInfo, FxError>>;
|
|
18
18
|
createRmClient(azureAccountProvider: AzureAccountProvider, subscriptionId: string): Promise<ResourceManagementClient>;
|
|
19
19
|
}
|
|
20
20
|
export declare const resourceGroupHelper: ResourceGroupHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,oBAAoB,EAEpB,OAAO,
|
|
1
|
+
{"version":3,"file":"ResourceGroupHelper.d.ts","sourceRoot":"","sources":["../../../src/component/utils/ResourceGroupHelper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,oBAAoB,EAEpB,OAAO,EACP,qBAAqB,EAGrB,MAAM,EAEP,MAAM,wBAAwB,CAAC;AAmBhC,oBAAY,iBAAiB,GAAG;IAC9B,sBAAsB,EAAE,OAAO,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAKF,cAAM,mBAAmB;IACjB,sBAAsB,CAC1B,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqC7B,2BAA2B,CAC/B,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAiB9B,oBAAoB,CACxB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAuBpD,kBAAkB,CACtB,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAkBzC,YAAY,CAChB,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAwCrC;;OAEG;IACG,sBAAsB,CAC1B,MAAM,EAAE,qBAAqB,EAC7B,oBAAoB,EAAE,oBAAoB,EAC1C,QAAQ,EAAE,wBAAwB,EAClC,wBAAwB,EAAE,MAAM,GAC/B,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAuCxC,cAAc,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM;CASxF;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
|