@microsoft/teamsfx-core 2.0.4-alpha.bdda88800.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 +42 -37
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +2 -2
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +8 -8
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.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 +5 -5
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +2 -0
- 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 +1 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +2 -0
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +4 -1
- 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 +2 -2
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +24 -6
- 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 +13 -5
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +60 -38
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts +5 -0
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardGenerator.js +120 -0
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +19 -1
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +43 -1
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +72 -14
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +21 -10
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +6 -0
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -0
- package/build/common/spec-parser/manifestUpdater.js +119 -0
- package/build/common/spec-parser/manifestUpdater.js.map +1 -0
- package/build/common/spec-parser/specFilter.d.ts +3 -0
- package/build/common/spec-parser/specFilter.d.ts.map +1 -0
- package/build/common/spec-parser/specFilter.js +40 -0
- package/build/common/spec-parser/specFilter.js.map +1 -0
- package/build/common/spec-parser/specParser.d.ts +15 -5
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +183 -34
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +28 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -0
- package/build/common/spec-parser/utils.js +242 -0
- package/build/common/spec-parser/utils.js.map +1 -0
- package/build/common/telemetry.d.ts +7 -5
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +40 -15
- package/build/common/telemetry.js.map +1 -1
- package/build/common/tools.js +2 -2
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.d.ts +1 -0
- package/build/common/utils.d.ts.map +1 -1
- package/build/common/utils.js +5 -1
- package/build/common/utils.js.map +1 -1
- package/build/component/configManager/constant.d.ts.map +1 -1
- package/build/component/configManager/constant.js +4 -2
- package/build/component/configManager/constant.js.map +1 -1
- package/build/component/configManager/interface.d.ts +5 -1
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/interface.js +2 -3
- package/build/component/configManager/interface.js.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 +27 -53
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.d.ts.map +1 -1
- package/build/component/configManager/parser.js +17 -9
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts +0 -3
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +4 -12
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constants.d.ts +10 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +10 -0
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +12 -8
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +85 -67
- 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 +4 -1
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts +1 -1
- package/build/component/developerPortalScaffoldUtils.d.ts.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +7 -7
- 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/error/aadManifestError.d.ts +3 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +14 -2
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/interface/AADApplication.js +1 -1
- package/build/component/driver/aad/interface/AADApplication.js.map +1 -1
- package/build/component/driver/aad/interface/AADManifest.js +1 -1
- package/build/component/driver/aad/interface/AADManifest.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 +58 -13
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +3 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +4 -1
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +10 -1
- 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 +2 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +15 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.d.ts.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +9 -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/arm/validator.d.ts.map +1 -1
- package/build/component/driver/arm/validator.js +3 -3
- package/build/component/driver/arm/validator.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 +4 -7
- 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 +8 -12
- 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 +11 -4
- 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 +27 -5
- 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 +33 -11
- 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 +12 -18
- 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 +5 -11
- 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 +6 -12
- 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 +33 -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 +11 -11
- 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 +5 -23
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts +0 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +1 -2
- package/build/component/driver/teamsApp/constants.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 +43 -29
- 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 +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 +4 -12
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/results.d.ts.map +1 -1
- package/build/component/driver/teamsApp/results.js +2 -0
- package/build/component/driver/teamsApp/results.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +6 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +19 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +2 -3
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +21 -19
- 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 +2 -10
- 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 +22 -18
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/error/componentError.d.ts +2 -1
- package/build/component/error/componentError.d.ts.map +1 -1
- package/build/component/error/componentError.js +8 -4
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +53 -24
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +7 -2
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +133 -25
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +12 -12
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +214 -28
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +7 -1
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +15 -3
- 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 +31 -22
- 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 +12 -5
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +2 -0
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.d.ts.map +1 -1
- package/build/component/generator/officeAddin/config/projectsJsonData.js +2 -0
- package/build/component/generator/officeAddin/config/projectsJsonData.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +9 -1
- 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 +11 -5
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +12 -12
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +10 -10
- 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 +16 -14
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +1 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +2 -0
- package/build/component/generator/spfx/utils/constants.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 +12 -4
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +17 -16
- 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/middleware/questionMW.d.ts +2 -2
- package/build/component/middleware/questionMW.d.ts.map +1 -1
- package/build/component/middleware/questionMW.js +7 -11
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.d.ts.map +1 -1
- package/build/component/migrate.js +2 -0
- package/build/component/migrate.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.d.ts.map +1 -1
- package/build/component/telemetry.js +3 -6
- 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/azureResourceOperation.js +2 -2
- package/build/component/utils/azureResourceOperation.js.map +1 -1
- package/build/component/utils/charsetUtils.d.ts.map +1 -1
- package/build/component/utils/charsetUtils.js +5 -3
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.d.ts +1 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +4 -5
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts.map +1 -1
- package/build/component/utils/depsChecker/common.js +1 -1
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +9 -5
- 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 +4 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts +3 -0
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +18 -4
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +2 -0
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +3 -6
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/component/utils.js.map +1 -1
- package/build/core/FxCore.d.ts +44 -32
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +823 -63
- package/build/core/FxCore.js.map +1 -1
- package/build/core/collaborator.d.ts +1 -1
- package/build/core/collaborator.d.ts.map +1 -1
- package/build/core/collaborator.js +16 -10
- package/build/core/collaborator.js.map +1 -1
- package/build/core/error.d.ts +6 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +23 -1
- package/build/core/error.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/index.js +1 -0
- package/build/core/index.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/errorHandler.d.ts +2 -0
- package/build/core/middleware/errorHandler.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +16 -25
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +7 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +35 -34
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +8 -8
- 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/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +3 -2
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +33 -15
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.d.ts +1 -0
- package/build/core/middleware/utils/migrationContext.d.ts.map +1 -1
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +6 -2
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +2 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +2 -0
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +8 -2
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +129 -22
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +2 -0
- package/build/error/deploy.js.map +1 -1
- package/build/error/index.d.ts.map +1 -1
- package/build/error/index.js +2 -0
- package/build/error/index.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +2 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +2 -0
- package/build/error/script.js.map +1 -1
- package/build/error/upgrade.d.ts.map +1 -1
- package/build/error/upgrade.js +2 -0
- package/build/error/upgrade.js.map +1 -1
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +2 -0
- package/build/error/yml.js.map +1 -1
- package/build/failpoint/index.d.ts.map +1 -1
- package/build/failpoint/index.js +2 -0
- package/build/failpoint/index.js.map +1 -1
- package/build/failpoint/marker.d.ts.map +1 -1
- package/build/failpoint/marker.js +2 -0
- package/build/failpoint/marker.js.map +1 -1
- package/build/failpoint/runtime.d.ts.map +1 -1
- package/build/failpoint/runtime.js +3 -4
- package/build/failpoint/runtime.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 -0
- package/build/question/constants.d.ts.map +1 -0
- package/build/question/constants.js +12 -0
- package/build/question/constants.js.map +1 -0
- package/build/question/create.d.ts +14 -15
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +465 -313
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts +4 -0
- package/build/question/generator.d.ts.map +1 -0
- package/build/question/generator.js +365 -0
- package/build/question/generator.js.map +1 -0
- package/build/question/index.d.ts +18 -28
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +18 -44
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateEnvInputs.d.ts +14 -0
- package/build/question/inputs/CreateEnvInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateEnvInputs.js +5 -0
- package/build/question/inputs/CreateEnvInputs.js.map +1 -0
- package/build/question/inputs/CreateProjectInputs.d.ts +40 -0
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateProjectInputs.js +5 -0
- package/build/question/inputs/CreateProjectInputs.js.map +1 -0
- package/build/question/inputs/CreateSampleProjectInputs.d.ts +12 -0
- package/build/question/inputs/CreateSampleProjectInputs.d.ts.map +1 -0
- package/build/question/inputs/CreateSampleProjectInputs.js +5 -0
- package/build/question/inputs/CreateSampleProjectInputs.js.map +1 -0
- package/build/question/inputs/DeployAadManifestInputs.d.ts +14 -0
- package/build/question/inputs/DeployAadManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/DeployAadManifestInputs.js +5 -0
- package/build/question/inputs/DeployAadManifestInputs.js.map +1 -0
- package/build/question/inputs/PermissionGrantInputs.d.ts +18 -0
- package/build/question/inputs/PermissionGrantInputs.d.ts.map +1 -0
- package/build/question/inputs/PermissionGrantInputs.js +5 -0
- package/build/question/inputs/PermissionGrantInputs.js.map +1 -0
- package/build/question/inputs/PermissionListInputs.d.ts +16 -0
- package/build/question/inputs/PermissionListInputs.d.ts.map +1 -0
- package/build/question/inputs/PermissionListInputs.js +5 -0
- package/build/question/inputs/PermissionListInputs.js.map +1 -0
- package/build/question/inputs/PreviewTeamsAppInputs.d.ts +14 -0
- package/build/question/inputs/PreviewTeamsAppInputs.d.ts.map +1 -0
- package/build/question/inputs/PreviewTeamsAppInputs.js +5 -0
- package/build/question/inputs/PreviewTeamsAppInputs.js.map +1 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts +18 -0
- package/build/question/inputs/SPFxAddWebpartInputs.d.ts.map +1 -0
- package/build/question/inputs/SPFxAddWebpartInputs.js +5 -0
- package/build/question/inputs/SPFxAddWebpartInputs.js.map +1 -0
- package/build/question/inputs/SelectTeamsManifestInputs.d.ts +12 -0
- package/build/question/inputs/SelectTeamsManifestInputs.d.ts.map +1 -0
- package/build/question/inputs/SelectTeamsManifestInputs.js +5 -0
- package/build/question/inputs/SelectTeamsManifestInputs.js.map +1 -0
- package/build/question/inputs/ValidateTeamsAppInputs.d.ts +14 -0
- package/build/question/inputs/ValidateTeamsAppInputs.d.ts.map +1 -0
- package/build/question/inputs/ValidateTeamsAppInputs.js +5 -0
- package/build/question/inputs/ValidateTeamsAppInputs.js.map +1 -0
- package/build/question/inputs/index.d.ts +11 -0
- package/build/question/inputs/index.d.ts.map +1 -0
- package/build/question/inputs/index.js +16 -0
- package/build/question/inputs/index.js.map +1 -0
- package/build/question/options/CreateEnvOptions.d.ts +10 -0
- package/build/question/options/CreateEnvOptions.d.ts.map +1 -0
- package/build/question/options/CreateEnvOptions.js +24 -0
- package/build/question/options/CreateEnvOptions.js.map +1 -0
- package/build/question/options/CreateProjectOptions.d.ts +10 -0
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -0
- package/build/question/options/CreateProjectOptions.js +137 -0
- package/build/question/options/CreateProjectOptions.js.map +1 -0
- package/build/question/options/CreateSampleProjectOptions.d.ts +10 -0
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -0
- package/build/question/options/CreateSampleProjectOptions.js +52 -0
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -0
- package/build/question/options/DeployAadManifestOptions.d.ts +10 -0
- package/build/question/options/DeployAadManifestOptions.d.ts.map +1 -0
- package/build/question/options/DeployAadManifestOptions.js +21 -0
- package/build/question/options/DeployAadManifestOptions.js.map +1 -0
- package/build/question/options/PermissionGrantOptions.d.ts +10 -0
- package/build/question/options/PermissionGrantOptions.d.ts.map +1 -0
- package/build/question/options/PermissionGrantOptions.js +33 -0
- package/build/question/options/PermissionGrantOptions.js.map +1 -0
- package/build/question/options/PermissionListOptions.d.ts +10 -0
- package/build/question/options/PermissionListOptions.d.ts.map +1 -0
- package/build/question/options/PermissionListOptions.js +28 -0
- package/build/question/options/PermissionListOptions.js.map +1 -0
- package/build/question/options/PreviewTeamsAppOptions.d.ts +10 -0
- package/build/question/options/PreviewTeamsAppOptions.d.ts.map +1 -0
- package/build/question/options/PreviewTeamsAppOptions.js +26 -0
- package/build/question/options/PreviewTeamsAppOptions.js.map +1 -0
- package/build/question/options/SPFxAddWebpartOptions.d.ts +10 -0
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -0
- package/build/question/options/SPFxAddWebpartOptions.js +37 -0
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -0
- package/build/question/options/SelectTeamsManifestOptions.d.ts +10 -0
- package/build/question/options/SelectTeamsManifestOptions.d.ts.map +1 -0
- package/build/question/options/SelectTeamsManifestOptions.js +17 -0
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -0
- package/build/question/options/ValidateTeamsAppOptions.d.ts +10 -0
- package/build/question/options/ValidateTeamsAppOptions.d.ts.map +1 -0
- package/build/question/options/ValidateTeamsAppOptions.js +23 -0
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -0
- package/build/question/options/index.d.ts +11 -0
- package/build/question/options/index.d.ts.map +1 -0
- package/build/question/options/index.js +16 -0
- package/build/question/options/index.js.map +1 -0
- package/build/question/other.d.ts +13 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +134 -26
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +7 -2
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +11 -3
- package/build/question/questionNames.js.map +1 -1
- package/build/question/util.d.ts.map +1 -1
- package/build/question/util.js +2 -2
- package/build/question/util.js.map +1 -1
- package/build/ui/validationUtils.d.ts +31 -0
- package/build/ui/validationUtils.d.ts.map +1 -0
- package/build/ui/validationUtils.js +297 -0
- package/build/ui/validationUtils.js.map +1 -0
- package/build/ui/visitor.d.ts +13 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +264 -215
- package/build/ui/visitor.js.map +1 -1
- package/package.json +21 -14
- package/resource/package.nls.json +58 -18
- package/resource/yaml-schema/v1.2/yaml.schema.json +1474 -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/bot/README.md +281 -263
- package/templates/plugins/resource/aad/auth/bot/js/sso/handleMessageExtensionQueryWithToken.js +13 -3
- package/templates/plugins/resource/aad/auth/bot/js/sso/profileSsoCommandHandler.js +14 -5
- package/templates/plugins/resource/aad/auth/bot/ts/sso/handleMessageExtensionQueryWithToken.ts +11 -3
- package/templates/plugins/resource/aad/auth/bot/ts/sso/profileSsoCommandHandler.ts +12 -3
- package/templates/plugins/resource/aad/auth/tab/csharp/GetUserProfile.razor +1 -2
- package/build/common/samples-config-v3.json +0 -233
- package/build/component/configManager/diagnostic.d.ts +0 -9
- package/build/component/configManager/diagnostic.d.ts.map +0 -1
- package/build/component/configManager/diagnostic.js +0 -47
- package/build/component/configManager/diagnostic.js.map +0 -1
- 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 -43
- package/build/core/FxCoreImplementV3.d.ts.map +0 -1
- package/build/core/FxCoreImplementV3.js +0 -653
- package/build/core/FxCoreImplementV3.js.map +0 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.ErrorHandlerMW = void 0;
|
|
5
|
+
exports.convertError = exports.ErrorHandlerMW = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
const globalVars_1 = require("../globalVars");
|
|
8
8
|
const common_1 = require("../../error/common");
|
|
@@ -11,34 +11,20 @@ const common_1 = require("../../error/common");
|
|
|
11
11
|
* to catch exceptions and return specific error.
|
|
12
12
|
*/
|
|
13
13
|
const ErrorHandlerMW = async (ctx, next) => {
|
|
14
|
-
|
|
15
|
-
// ctx.method === "executeUserTask" ? (ctx.arguments[0] as Func).method : ""
|
|
16
|
-
// }`;
|
|
17
|
-
// if locale is set in inputs, set it globally.
|
|
14
|
+
var _a;
|
|
18
15
|
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
19
16
|
if (inputs === null || inputs === void 0 ? void 0 : inputs.locale)
|
|
20
17
|
globalVars_1.setLocale(inputs.locale);
|
|
21
18
|
try {
|
|
22
|
-
// let log = `FxCore start call:${taskName}`;
|
|
23
|
-
// if (inputs.loglevel && inputs.loglevel === "Debug") {
|
|
24
|
-
// TOOLS?.logProvider?.debug(log);
|
|
25
|
-
// } else {
|
|
26
|
-
// TOOLS?.logProvider?.info(log);
|
|
27
|
-
// }
|
|
28
|
-
// const time = new Date().getTime();
|
|
29
19
|
await next();
|
|
30
|
-
// log = `FxCore finish call:${taskName}, time: ${new Date().getTime() - time} ms`;
|
|
31
|
-
// if (inputs.loglevel && inputs.loglevel === "Debug") {
|
|
32
|
-
// TOOLS?.logProvider?.debug(log);
|
|
33
|
-
// } else {
|
|
34
|
-
// TOOLS?.logProvider?.info(log);
|
|
35
|
-
// }
|
|
36
20
|
}
|
|
37
21
|
catch (e) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
22
|
+
const fxError = common_1.assembleError(e);
|
|
23
|
+
ctx.result = teamsfx_api_1.err(fxError);
|
|
24
|
+
}
|
|
25
|
+
if ((_a = ctx.result) === null || _a === void 0 ? void 0 : _a.isErr()) {
|
|
26
|
+
let fxError = ctx.result.error;
|
|
27
|
+
fxError = convertError(fxError);
|
|
42
28
|
ctx.result = teamsfx_api_1.err(fxError);
|
|
43
29
|
}
|
|
44
30
|
};
|
|
@@ -58,19 +44,24 @@ const Reg12 = /.+no space left on device.+/;
|
|
|
58
44
|
// const Reg12 = /ENOENT: no such file or directory/;
|
|
59
45
|
// const Reg13 = /EBUSY: resource busy or locked/;
|
|
60
46
|
// const Reg14 = /Lock is not .+ by you/;
|
|
61
|
-
|
|
47
|
+
const Reg15 = /EPERM: operation not permitted/;
|
|
62
48
|
const Regs = [Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7, Reg8, Reg9, Reg10, Reg11, Reg12];
|
|
63
|
-
|
|
49
|
+
function convertError(err) {
|
|
64
50
|
const msg = err.message;
|
|
65
51
|
if (!msg)
|
|
66
52
|
return err;
|
|
53
|
+
if (Reg15.test(msg) === true) {
|
|
54
|
+
const userError = new common_1.FilePermissionError(err, err.source);
|
|
55
|
+
return userError;
|
|
56
|
+
}
|
|
67
57
|
for (const reg of Regs) {
|
|
68
58
|
if (reg.test(msg) === true) {
|
|
69
|
-
const userError = new teamsfx_api_1.UserError(err.source, err.name, err.message);
|
|
59
|
+
const userError = new teamsfx_api_1.UserError(err.source, err.name, err.message, err.displayMessage);
|
|
70
60
|
userError.stack = err.stack;
|
|
71
61
|
return userError;
|
|
72
62
|
}
|
|
73
63
|
}
|
|
74
64
|
return err;
|
|
75
65
|
}
|
|
66
|
+
exports.convertError = convertError;
|
|
76
67
|
//# sourceMappingURL=errorHandler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAA6E;AAC7E,8CAA0C;AAC1C,+
|
|
1
|
+
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAA6E;AAC7E,8CAA0C;AAC1C,+CAAwE;AAExE;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;IACvF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM;QAAE,sBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI;QACF,MAAM,IAAI,EAAE,CAAC;KACd;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,OAAO,GAAG,sBAAa,CAAC,CAAC,CAAC,CAAC;QACjC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;IACD,IAAI,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,EAAE,EAAE;QACvB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AAdW,QAAA,cAAc,kBAczB;AAEF,MAAM,IAAI,GACR,mMAAmM,CAAC;AACtM,MAAM,IAAI,GAAG,6EAA6E,CAAC;AAC3F,MAAM,IAAI,GAAG,yCAAyC,CAAC;AACvD,MAAM,IAAI,GACR,yJAAyJ,CAAC;AAC5J,MAAM,IAAI,GACR,uIAAuI,CAAC;AAC1I,MAAM,IAAI,GACR,sGAAsG,CAAC;AACzG,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAC1D,MAAM,IAAI,GACR,4FAA4F,CAAC;AAC/F,MAAM,IAAI,GAAG,kDAAkD,CAAC;AAChE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,KAAK,GAAG,kCAAkC,CAAC;AACjD,MAAM,KAAK,GAAG,6BAA6B,CAAC;AAC5C,qDAAqD;AACrD,kDAAkD;AAClD,yCAAyC;AACzC,MAAM,KAAK,GAAG,gCAAgC,CAAC;AAE/C,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEzF,SAAgB,YAAY,CAAC,GAAU;IACrC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QAC5B,MAAM,SAAS,GAAG,IAAI,4BAAmB,CAAC,GAAG,EAAG,GAAW,CAAC,MAAM,CAAC,CAAC;QACpE,OAAO,SAAS,CAAC;KAClB;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,uBAAS,CAC5B,GAAW,CAAC,MAAM,EACnB,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACV,GAAW,CAAC,cAAc,CAC5B,CAAC;YACF,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAC5B,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AApBD,oCAoBC"}
|
|
@@ -9,9 +9,14 @@ export declare const errorNames: {
|
|
|
9
9
|
aadManifestTemplateNotExist: string;
|
|
10
10
|
};
|
|
11
11
|
export declare const moreInfoButton: string;
|
|
12
|
+
declare type Migration = (context: MigrationContext) => Promise<void>;
|
|
13
|
+
export declare const subMigrations: Array<Migration>;
|
|
12
14
|
export declare const ProjectMigratorMWV3: Middleware;
|
|
13
|
-
export declare function wrapRunMigration(context: MigrationContext, exec:
|
|
15
|
+
export declare function wrapRunMigration(context: MigrationContext, exec: Migration): Promise<void>;
|
|
16
|
+
export declare function buildErrorMessage(error: any, step?: string): string;
|
|
17
|
+
export declare function rollbackMigration(context: MigrationContext): Promise<void>;
|
|
14
18
|
export declare function migrate(context: MigrationContext): Promise<void>;
|
|
19
|
+
export declare function preMigration(context: MigrationContext): Promise<void>;
|
|
15
20
|
export declare function checkVersionForMigration(ctx: CoreHookContext): Promise<VersionForMigration>;
|
|
16
21
|
export declare function generateAppYml(context: MigrationContext): Promise<void>;
|
|
17
22
|
export declare function updateLaunchJson(context: MigrationContext): Promise<void>;
|
|
@@ -26,4 +31,5 @@ export declare function checkapimPluginExists(pjSettings: any): boolean;
|
|
|
26
31
|
export declare function generateApimPluginEnvContent(context: MigrationContext): Promise<void>;
|
|
27
32
|
export declare function checkActiveResourcePlugins(projectPath: string): Promise<boolean>;
|
|
28
33
|
export declare function updateGitignore(context: MigrationContext): Promise<void>;
|
|
34
|
+
export {};
|
|
29
35
|
//# sourceMappingURL=projectMigratorV3.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAgF1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AA4C9C,eAAO,MAAM,aAAa,6CAA6C,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;CAItB,CAAC;AAEF,eAAO,MAAM,cAAc,QAA6C,CAAC;AAOzE,aAAK,SAAS,GAAG,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAC9D,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,SAAS,CAY1C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UA6CjC,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhG;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAUnE;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhF;AAWD,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKtE;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWjG;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD/E;AAWD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8GjF;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BtF;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAmHD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE/E;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD9E;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhF;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE7E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAQ9D;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC3F;AAED,wBAAsB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBtF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.updateGitignore = exports.checkActiveResourcePlugins = exports.generateApimPluginEnvContent = exports.checkapimPluginExists = exports.debugMigration = exports.userdataMigration = exports.statesMigration = exports.configsMigration = exports.showNotification = exports.azureParameterMigration = exports.manifestsMigration = exports.updateLaunchJson = exports.generateAppYml = exports.checkVersionForMigration = exports.migrate = exports.wrapRunMigration = exports.ProjectMigratorMWV3 = exports.moreInfoButton = exports.errorNames = exports.learnMoreLink = void 0;
|
|
5
|
+
exports.updateGitignore = exports.checkActiveResourcePlugins = exports.generateApimPluginEnvContent = exports.checkapimPluginExists = exports.debugMigration = exports.userdataMigration = exports.statesMigration = exports.configsMigration = exports.showNotification = exports.azureParameterMigration = exports.manifestsMigration = exports.updateLaunchJson = exports.generateAppYml = exports.checkVersionForMigration = exports.preMigration = exports.migrate = exports.rollbackMigration = exports.buildErrorMessage = exports.wrapRunMigration = exports.ProjectMigratorMWV3 = exports.subMigrations = exports.moreInfoButton = exports.errorNames = exports.learnMoreLink = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
/**
|
|
8
8
|
* @author xzf0587 <zhaofengxu@microsoft.com>
|
|
@@ -12,12 +12,11 @@ const migrationContext_1 = require("./utils/migrationContext");
|
|
|
12
12
|
const path = tslib_1.__importStar(require("path"));
|
|
13
13
|
const projectSettingsLoader_1 = require("./projectSettingsLoader");
|
|
14
14
|
const telemetry_1 = require("../../common/telemetry");
|
|
15
|
-
const constants_1 = require("../../component/constants");
|
|
16
15
|
const globalVars_1 = require("../globalVars");
|
|
17
16
|
const error_1 = require("../error");
|
|
18
17
|
const appYmlGenerator_1 = require("./utils/appYmlGenerator");
|
|
19
18
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
20
|
-
const
|
|
19
|
+
const constants_1 = require("../../component/driver/teamsApp/constants");
|
|
21
20
|
const MigrationUtils_1 = require("./utils/MigrationUtils");
|
|
22
21
|
const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
|
|
23
22
|
const commentJson = tslib_1.__importStar(require("comment-json"));
|
|
@@ -30,8 +29,9 @@ const folder_1 = require("../../folder");
|
|
|
30
29
|
const versionMetadata_1 = require("../../common/versionMetadata");
|
|
31
30
|
const tools_1 = require("../../common/tools");
|
|
32
31
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
33
|
-
const
|
|
32
|
+
const constants_2 = require("./utils/debug/constants");
|
|
34
33
|
const ManifestUtils_1 = require("../../component/driver/teamsApp/utils/ManifestUtils");
|
|
34
|
+
const error_2 = require("../../error");
|
|
35
35
|
const Constants = {
|
|
36
36
|
vscodeProvisionBicepPath: "./templates/azure/provision.bicep",
|
|
37
37
|
launchJsonPath: ".vscode/launch.json",
|
|
@@ -79,7 +79,7 @@ const migrationMessageButtons = [upgradeButton, exports.moreInfoButton];
|
|
|
79
79
|
const telemetryProperties = {
|
|
80
80
|
[TelemetryPropertyKey.upgradeVersion]: TelemetryPropertyValue.upgradeVersion,
|
|
81
81
|
};
|
|
82
|
-
|
|
82
|
+
exports.subMigrations = [
|
|
83
83
|
preMigration,
|
|
84
84
|
manifestsMigration,
|
|
85
85
|
generateAppYml,
|
|
@@ -143,22 +143,9 @@ async function wrapRunMigration(context, exec) {
|
|
|
143
143
|
sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrate, context.telemetryProperties);
|
|
144
144
|
}
|
|
145
145
|
catch (error) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
}
|
|
150
|
-
else {
|
|
151
|
-
if (!(error instanceof Error)) {
|
|
152
|
-
error = new Error(error.toString());
|
|
153
|
-
}
|
|
154
|
-
fxError = new teamsfx_api_1.SystemError({
|
|
155
|
-
error,
|
|
156
|
-
source: telemetry_1.Component.core,
|
|
157
|
-
name: constants_1.ErrorConstants.unhandledError,
|
|
158
|
-
message: error.message,
|
|
159
|
-
displayMessage: error.message,
|
|
160
|
-
});
|
|
161
|
-
}
|
|
146
|
+
const errorMessage = buildErrorMessage(error, context.currentStep);
|
|
147
|
+
const fxError = error_2.assembleError(error, telemetry_1.Component.core);
|
|
148
|
+
fxError.message = errorMessage;
|
|
162
149
|
sendTelemetryErrorEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorError, fxError, context.telemetryProperties);
|
|
163
150
|
await rollbackMigration(context);
|
|
164
151
|
throw error;
|
|
@@ -166,11 +153,24 @@ async function wrapRunMigration(context, exec) {
|
|
|
166
153
|
await context.removeFxV2();
|
|
167
154
|
}
|
|
168
155
|
exports.wrapRunMigration = wrapRunMigration;
|
|
156
|
+
function buildErrorMessage(error, step) {
|
|
157
|
+
let message = error.message;
|
|
158
|
+
if (error.code === "ENOENT" && error.path) {
|
|
159
|
+
const fileName = path.basename(error.path);
|
|
160
|
+
message = `Missing file: ${fileName}\n${message}`;
|
|
161
|
+
}
|
|
162
|
+
if (step) {
|
|
163
|
+
message = `MigrationStep: ${step}\n${message}`;
|
|
164
|
+
}
|
|
165
|
+
return message;
|
|
166
|
+
}
|
|
167
|
+
exports.buildErrorMessage = buildErrorMessage;
|
|
169
168
|
async function rollbackMigration(context) {
|
|
170
169
|
await context.cleanModifiedPaths();
|
|
171
170
|
await context.restoreBackup();
|
|
172
171
|
await context.cleanBackup();
|
|
173
172
|
}
|
|
173
|
+
exports.rollbackMigration = rollbackMigration;
|
|
174
174
|
async function showSummaryReport(context) {
|
|
175
175
|
var _a, _b;
|
|
176
176
|
const summaryPath = path.join(context.backupPath, Constants.reportName);
|
|
@@ -180,7 +180,8 @@ async function showSummaryReport(context) {
|
|
|
180
180
|
await ((_b = (_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui) === null || _a === void 0 ? void 0 : _a.openFile) === null || _b === void 0 ? void 0 : _b.call(_a, summaryPath));
|
|
181
181
|
}
|
|
182
182
|
async function migrate(context) {
|
|
183
|
-
for (const subMigration of subMigrations) {
|
|
183
|
+
for (const subMigration of exports.subMigrations) {
|
|
184
|
+
context.currentStep = subMigration.name;
|
|
184
185
|
await subMigration(context);
|
|
185
186
|
}
|
|
186
187
|
}
|
|
@@ -188,6 +189,7 @@ exports.migrate = migrate;
|
|
|
188
189
|
async function preMigration(context) {
|
|
189
190
|
await context.backup(versionMetadata_1.MetadataV2.configFolder);
|
|
190
191
|
}
|
|
192
|
+
exports.preMigration = preMigration;
|
|
191
193
|
async function checkVersionForMigration(ctx) {
|
|
192
194
|
const versionInfo = await v3MigrationUtils_1.getProjectVersion(ctx);
|
|
193
195
|
const versionState = v3MigrationUtils_1.getVersionState(versionInfo);
|
|
@@ -222,17 +224,17 @@ async function updateLaunchJson(context) {
|
|
|
222
224
|
const oldProjectSettings = await loadProjectSettings(context.projectPath);
|
|
223
225
|
if (oldProjectSettings.isM365) {
|
|
224
226
|
const jsonObject = JSON.parse(launchJsonContent);
|
|
225
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
226
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
227
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.teams, constants_2.LaunchBrowser.edge, "Edge", constants_2.LaunchUrl.teamsRemote, 1));
|
|
228
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.teams, constants_2.LaunchBrowser.chrome, "Chrome", constants_2.LaunchUrl.teamsRemote, 1));
|
|
227
229
|
if (debugV3MigrationUtils_1.OldProjectSettingsHelper.includeTab(oldProjectSettings)) {
|
|
228
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
229
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
230
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
231
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
230
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.outlook, constants_2.LaunchBrowser.edge, "Edge", constants_2.LaunchUrl.outlookRemoteTab, 2));
|
|
231
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.outlook, constants_2.LaunchBrowser.chrome, "Chrome", constants_2.LaunchUrl.outlookRemoteTab, 2));
|
|
232
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.office, constants_2.LaunchBrowser.edge, "Edge", constants_2.LaunchUrl.officeRemoteTab, 3));
|
|
233
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.office, constants_2.LaunchBrowser.chrome, "Chrome", constants_2.LaunchUrl.officeRemoteTab, 3));
|
|
232
234
|
}
|
|
233
235
|
else if (debugV3MigrationUtils_1.OldProjectSettingsHelper.includeBot(oldProjectSettings)) {
|
|
234
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
235
|
-
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(
|
|
236
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.outlook, constants_2.LaunchBrowser.edge, "Edge", constants_2.LaunchUrl.outlookRemoteBot, 2));
|
|
237
|
+
jsonObject.configurations.push(debugV3MigrationUtils_1.launchRemote(constants_2.HubName.outlook, constants_2.LaunchBrowser.chrome, "Chrome", constants_2.LaunchUrl.outlookRemoteBot, 2));
|
|
236
238
|
}
|
|
237
239
|
launchJsonContent = JSON.stringify(jsonObject, null, 4);
|
|
238
240
|
}
|
|
@@ -257,7 +259,7 @@ async function loadProjectSettings(projectPath) {
|
|
|
257
259
|
async function manifestsMigration(context) {
|
|
258
260
|
// Check manifest existing
|
|
259
261
|
const oldAppPackageFolderPath = path.join(v3MigrationUtils_1.getTemplateFolderPath(context), teamsfx_api_1.AppPackageFolderName);
|
|
260
|
-
const oldManifestPath = path.join(oldAppPackageFolderPath,
|
|
262
|
+
const oldManifestPath = path.join(oldAppPackageFolderPath, constants_1.MANIFEST_TEMPLATE_CONSOLIDATE);
|
|
261
263
|
const oldManifestAbsolutePath = path.join(context.projectPath, oldManifestPath);
|
|
262
264
|
const oldManifestExists = await fs.pathExists(oldManifestAbsolutePath);
|
|
263
265
|
if (!oldManifestExists) {
|
|
@@ -283,7 +285,7 @@ async function manifestsMigration(context) {
|
|
|
283
285
|
// copy other files from old path to new except manifest.template.json and aad.template.json
|
|
284
286
|
const oldAppPackageFiles = await fs.readdir(path.join(context.projectPath, oldAppPackageFolderPath));
|
|
285
287
|
for (const file of oldAppPackageFiles) {
|
|
286
|
-
if (file !==
|
|
288
|
+
if (file !== constants_1.MANIFEST_TEMPLATE_CONSOLIDATE && file !== versionMetadata_1.MetadataV2.aadTemplateFileName) {
|
|
287
289
|
await context.fsCopy(path.join(oldAppPackageFolderPath, file), path.join(teamsfx_api_1.AppPackageFolderName, file));
|
|
288
290
|
}
|
|
289
291
|
}
|
|
@@ -309,8 +311,7 @@ async function manifestsMigration(context) {
|
|
|
309
311
|
// Read AAD app manifest and save to ./aad.manifest.json
|
|
310
312
|
const oldAadManifestPath = path.join(oldAppPackageFolderPath, versionMetadata_1.MetadataV2.aadTemplateFileName);
|
|
311
313
|
const oldAadManifestExists = await fs.pathExists(path.join(context.projectPath, oldAadManifestPath));
|
|
312
|
-
const activeResourcePlugins = projectSettings.solutionSettings
|
|
313
|
-
.activeResourcePlugins;
|
|
314
|
+
const activeResourcePlugins = projectSettings.solutionSettings.activeResourcePlugins;
|
|
314
315
|
const component = projectSettings.components;
|
|
315
316
|
const aadRequired = (activeResourcePlugins && activeResourcePlugins.includes("fx-resource-aad-app-for-teams")) ||
|
|
316
317
|
(component &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMigratorV3.js","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,wDAQgC;AAGhC,+DAA0E;AAC1E,mDAA6B;AAC7B,mEAA6E;AAC7E,sDAKgC;AAChC,yDAA2D;AAC3D,8CAAsC;AACtC,oCAKkB;AAClB,6DAA0D;AAC1D,qDAA+B;AAC/B,yEAA0F;AAC1F,2DAA4E;AAC5E,+DAsBkC;AAClC,kEAA4C;AAC5C,+EAA4E;AAC5E,+EAO6C;AAC7C,6DAqBoC;AACpC,6EAA0E;AAC1E,2BAAyB;AACzB,yCAAkD;AAClD,kEAAmG;AACnG,8CAAmD;AAEnD,8DAAgE;AAChE,uDAA4E;AAC5E,uFAAoF;AAEpF,MAAM,SAAS,GAAG;IAChB,wBAAwB,EAAE,mCAAmC;IAC7D,cAAc,EAAE,qBAAqB;IACrC,aAAa,EAAE,oBAAoB;IACnC,UAAU,EAAE,kBAAkB;IAC9B,cAAc,EAAE;QACd,qEAAqE;QACrE,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,IAAI;KACX;IACD,aAAa,EAAE,OAAO;CACvB,CAAC;AAEF,MAAM,UAAU,GAAG;IACjB,eAAe,EAAE,iBAAiB;IAClC,iBAAiB,EAAE,mBAAmB;IACtC,WAAW,EAAE,aAAa;CAC3B,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;IACZ,cAAc,EAAE,iBAAiB;IACjC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,sBAAsB,GAAG;IAC7B,EAAE,EAAE,IAAI;IACR,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,cAAc;IAC3B,eAAe,EAAE,mBAAmB;IACpC,cAAc,EAAE,KAAK;CACtB,CAAC;AAEW,QAAA,aAAa,GAAG,0CAA0C,CAAC;AAExE,yIAAyI;AAC5H,QAAA,UAAU,GAAG;IACxB,wBAAwB,EAAE,0BAA0B;IACpD,uBAAuB,EAAE,yBAAyB;IAClD,2BAA2B,EAAE,6BAA6B;CAC3D,CAAC;AACF,MAAM,aAAa,GAAG,kCAAkB,CAAC,qBAAqB,CAAC,CAAC;AACnD,QAAA,cAAc,GAAG,kCAAkB,CAAC,sBAAsB,CAAC,CAAC;AACzE,MAAM,uBAAuB,GAAG,CAAC,aAAa,EAAE,sBAAc,CAAC,CAAC;AAEhE,MAAM,mBAAmB,GAAG;IAC1B,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,cAAc;CAC7E,CAAC;AAGF,MAAM,aAAa,GAAqB;IACtC,YAAY;IACZ,kBAAkB;IAClB,cAAc;IACd,gBAAgB;IAChB,eAAe;IACf,iBAAiB;IACjB,4BAA4B;IAC5B,gBAAgB;IAChB,uBAAuB;IACvB,cAAc;IACd,eAAe;CAChB,CAAC;AAEK,MAAM,mBAAmB,GAAe,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IAChG,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAChE,iGAAiG;IACjG,IAAI,mBAAmB,CAAC,MAAM,KAAK,+BAAa,CAAC,QAAQ,EAAE;QACzD,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACzB,MAAM,EACN,kCAAkB,CAAC,mCAAmC,CAAC,EACvD,IAAI,CACL,CAAA,CAAC;QACF,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,6BAAqB,EAAE,CAAC,CAAC;QAC1C,OAAO;KACR;IACD,MAAM,WAAW,GAAG,sCAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,OAAO,IAAI,mBAAmB,CAAC,KAAK,KAAK,8BAAY,CAAC,WAAW,CAAC;IACxF,IAAI,aAAa,EAAE;QACjB,2FAA2F;QAC3F,MAAM,cAAc,GAAG,sCAAmB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAClE,IAAI,cAAc,EAAE;YAClB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,gCAAwB,EAAE,CAAC,CAAC;YACjD,OAAO;SACR;QAED,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QACxE,IAAI,cAAc,EAAE;YAClB,MAAM,iBAAiB,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;YACjF,IAAI,iBAAiB,EAAE;gBACrB,MAAM,mBAAmB,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,CAAC;gBAChE,IAAI,mBAAmB,CAAC,KAAK,KAAK,8BAAY,CAAC,WAAW,EAAE;oBAC1D,GAAG,CAAC,MAAM,GAAG,gBAAE,CAAC,SAAS,CAAC,CAAC;oBAC3B,OAAO;iBACR;aACF;YACD,MAAM,gBAAgB,GAAG,MAAM,mCAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5D,MAAM,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAClD,GAAG,CAAC,MAAM,GAAG,gBAAE,CAAC,SAAS,CAAC,CAAC;SAC5B;QACD,OAAO;KACR;SAAM;QACL,gCAAgC;QAChC,qCAAqC;QACrC,8CAA8C;QAC9C,MAAM,IAAI,EAAE,CAAC;KACd;AACH,CAAC,CAAC;AA7CW,QAAA,mBAAmB,uBA6C9B;AAEK,KAAK,UAAU,gBAAgB,CACpC,OAAyB,EACzB,IAAyC;IAEzC,IAAI;QACF,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,CAAC,CAAC;QACzF,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;QACpB,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACjC,4BAA4B,CAC1B,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,sBAAsB,EACrC,OAAO,CAAC,mBAAmB,CAC5B,CAAC;KACH;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,OAAgB,CAAC;QACrB,IAAI,KAAK,YAAY,uBAAS,IAAI,KAAK,YAAY,yBAAW,EAAE;YAC9D,OAAO,GAAG,KAAK,CAAC;SACjB;aAAM;YACL,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE;gBAC7B,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;aACrC;YACD,OAAO,GAAG,IAAI,yBAAW,CAAC;gBACxB,KAAK;gBACL,MAAM,EAAE,qBAAS,CAAC,IAAI;gBACtB,IAAI,EAAE,0BAAc,CAAC,cAAc;gBACnC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,cAAc,EAAE,KAAK,CAAC,OAAO;aAC9B,CAAC,CAAC;SACJ;QACD,iCAAiC,CAC/B,qBAAS,CAAC,IAAI,EACd,0BAAc,CAAC,oBAAoB,EACnC,OAAO,EACP,OAAO,CAAC,mBAAmB,CAC5B,CAAC;QACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,KAAK,CAAC;KACb;IACD,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;AAC7B,CAAC;AAvCD,4CAuCC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAAyB;IACxD,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACnC,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;IAC9B,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAAyB;;IACxD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,kBAAkB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAE/F,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACzC,MAAM,CAAA,MAAA,MAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,0CAAE,QAAQ,mDAAG,WAAW,CAAC,CAAA,CAAC;AAC3C,CAAC;AAEM,KAAK,UAAU,OAAO,CAAC,OAAyB;IACrD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;KAC7B;AACH,CAAC;AAJD,0BAIC;AAED,KAAK,UAAU,YAAY,CAAC,OAAyB;IACnD,MAAM,OAAO,CAAC,MAAM,CAAC,4BAAU,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAAC,GAAoB;IACjE,MAAM,WAAW,GAAG,MAAM,oCAAiB,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,kCAAe,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,EAAE,sBAAQ,CAAC,MAAM,CAAa,CAAC;IAEnF,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,OAAO;QACnC,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,KAAK,EAAE,YAAY;QACnB,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC;AAXD,4DAWC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAyB;;IAC5D,MAAM,YAAY,GAAW,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,IAAI,iCAAe,CACzC,kBAAkB,EAClB,YAAY,EACZ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,YAAY,GAAW,MAAM,eAAe,CAAC,cAAc,EAAE,CAAC;IACpE,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC/D,IAAI,CAAA,MAAA,kBAAkB,CAAC,mBAAmB,0CAAE,WAAW,EAAE,MAAK,QAAQ,EAAE;QACtE,MAAM,mBAAmB,GAAG,MAAM,8CAAsB,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,iBAAiB,GAAW,MAAM,eAAe,CAAC,mBAAmB,CACzE,mBAAmB,CACpB,CAAC;QACF,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;KAC1E;AACH,CAAC;AAjBD,wCAiBC;AAEM,KAAK,UAAU,gBAAgB,CAAC,OAAyB;IAC9D,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;IAChF,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;QACvC,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,iBAAiB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1E,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACjD,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,KAAK,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAClF,CAAC;YACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,KAAK,EAAE,yBAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CACtF,CAAC;YACF,IAAI,gDAAwB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;gBAC3D,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,OAAO,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,CACzF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CACV,mBAAO,CAAC,OAAO,EACf,yBAAa,CAAC,MAAM,EACpB,QAAQ,EACR,qBAAS,CAAC,gBAAgB,EAC1B,CAAC,CACF,CACF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,MAAM,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CACvF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,MAAM,EAAE,yBAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAC3F,CAAC;aACH;iBAAM,IAAI,gDAAwB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;gBAClE,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CAAC,mBAAO,CAAC,OAAO,EAAE,yBAAa,CAAC,IAAI,EAAE,MAAM,EAAE,qBAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,CACzF,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC,IAAI,CAC5B,oCAAY,CACV,mBAAO,CAAC,OAAO,EACf,yBAAa,CAAC,MAAM,EACpB,QAAQ,EACR,qBAAS,CAAC,gBAAgB,EAC1B,CAAC,CACF,CACF,CAAC;aACH;YACD,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;SACzD;QACD,MAAM,MAAM,GAAG,iBAAiB;aAC7B,OAAO,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;aAC/C,OAAO,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC,gBAAgB;aACvE,OAAO,CAAC,sBAAsB,EAAE,yBAAyB,CAAC;aAC1D,OAAO,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,CAAC,CAAC,gBAAgB;QACtF,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;KAC7D;AACH,CAAC;AAxDD,4CAwDC;AAED,KAAK,UAAU,mBAAmB,CAAC,WAAmB;IACpD,MAAM,kBAAkB,GAAG,MAAM,0DAAkC,CAAC,WAAW,CAAC,CAAC;IACjF,IAAI,kBAAkB,CAAC,IAAI,EAAE,EAAE;QAC7B,OAAO,kBAAkB,CAAC,KAAK,CAAC;KACjC;SAAM;QACL,MAAM,kBAAkB,CAAC,KAAK,CAAC;KAChC;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,OAAyB;IAChE,0BAA0B;IAC1B,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,wCAAqB,CAAC,OAAO,CAAC,EAAE,kCAAoB,CAAC,CAAC;IAChG,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,yCAA6B,CAAC,CAAC;IAC1F,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAChF,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IACvE,IAAI,CAAC,iBAAiB,EAAE;QACtB,6DAA6D;QAC7D,MAAM,sBAAc,CAClB,IAAI,KAAK,CAAC,kCAAkB,CAAC,mCAAmC,CAAC,CAAC,EAClE,kBAAU,CAAC,wBAAwB,EACnC,qBAAa,CACd,CAAC;KACH;IAED,6BAA6B;IAC7B;QACE,MAAM,GAAG,GAAG,MAAM,6BAAa,CAAC,gBAAgB,CAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAChD,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,sBAAc,CAClB,IAAI,KAAK,CAAC,kCAAkB,CAAC,kCAAkC,CAAC,CAAC,EACjE,kBAAU,CAAC,uBAAuB,CACnC,CAAC;SACH;KACF;IAED,8BAA8B;IAC9B,MAAM,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IAE9C,aAAa;IACb,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,+CAA4B,CAAC,YAAY,CAAC,EAAE;QAC9C,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;KACjC;IAED,oBAAoB;IACpB,MAAM,OAAO,CAAC,WAAW,CAAC,kCAAoB,CAAC,CAAC;IAEhD,4FAA4F;IAC5F,MAAM,kBAAkB,GAAG,MAAM,EAAE,CAAC,OAAO,CACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC,CACxD,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;QACrC,IAAI,IAAI,KAAK,yCAA6B,IAAI,IAAI,KAAK,4BAAU,CAAC,mBAAmB,EAAE;YACrF,MAAM,OAAO,CAAC,MAAM,CAClB,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,EACxC,IAAI,CAAC,IAAI,CAAC,kCAAoB,EAAE,IAAI,CAAC,CACtC,CAAC;SACH;KACF;IAED,mCAAmC;IACnC,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,YAAY,GAAG,sCAAmB,CAAC,eAAe,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,mCAAgB,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,qBAAa,CAAC,eAAe,CAAC,CAAC;IAE9C,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,mDAAgC,CACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAC/C,YAAY,CAAC,GAAG,EAChB,YAAY,CAAC,MAAM,EACnB,OAAO,CAAC,gBAAgB,CACzB,CAAC;KACH;IACD,yEAAyE;IACzE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,kCAAoB,EAAE,4BAAU,CAAC,qBAAqB,CAAC,CAAC;IACvF,IAAI,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IAC7F,WAAW,GAAG,kCAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,yCAAwB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACrE,IAAI,MAAM,EAAE;QACV,MAAM,+CAA4B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;KACvD;SAAM;QACL,MAAM,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;KACnD;IAED,wDAAwD;IACxD,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,4BAAU,CAAC,mBAAmB,CAAC,CAAC;IAC9F,MAAM,oBAAoB,GAAG,MAAM,EAAE,CAAC,UAAU,CAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,CAAC,CACnD,CAAC;IAEF,MAAM,qBAAqB,GAAI,eAAe,CAAC,gBAAwB;SACpE,qBAA8B,CAAC;IAClC,MAAM,SAAS,GAAI,eAAuB,CAAC,UAAmB,CAAC;IAC/D,MAAM,WAAW,GACf,CAAC,qBAAqB,IAAI,qBAAqB,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;QAC1F,CAAC,SAAS;YACR,SAAS,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC5C,OAAO,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEb,IAAI,oBAAoB,IAAI,WAAW,EAAE;QACvC,IAAI,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CACpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAClD,OAAO,CACR,CAAC;QACF,cAAc,GAAG,kCAAe,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,yCAAwB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAC3E,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;KACxE;SAAM,IAAI,WAAW,IAAI,CAAC,oBAAoB,EAAE;QAC/C,MAAM,sBAAc,CAClB,IAAI,KAAK,CAAC,kCAAkB,CAAC,sCAAsC,CAAC,CAAC,EACrE,kBAAU,CAAC,2BAA2B,EACtC,qBAAa,CACd,CAAC;KACH;IAED,MAAM,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;AAClD,CAAC;AA/GD,gDA+GC;AAEM,KAAK,UAAU,uBAAuB,CAAC,OAAyB;IACrE,8BAA8B;IAC9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC5E,IAAI,CAAC,sBAAsB,EAAE;QAC3B,kEAAkE;QAClE,OAAO;KACR;IAED,aAAa;IACb,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,wCAAqB,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC3D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;YAC7C,SAAS;SACV;QAED,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAC1D,OAAO,CACR,CAAC;QAEF,MAAM,UAAU,GAAG,yCAAwB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;KAC7E;AACH,CAAC;AA3BD,0DA2BC;AAEM,KAAK,UAAU,gBAAgB,CACpC,GAAoB,EACpB,mBAAwC;IAExC,MAAM,iBAAiB,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACjF,IAAI,iBAAiB,EAAE;QACrB,OAAO,MAAM,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;KACjE;IACD,MAAM,WAAW,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACrE,IAAI,WAAW,EAAE;QACf,OAAO,MAAM,2BAA2B,CAAC,GAAG,CAAC,CAAC;KAC/C;IACD,MAAM,eAAe,GAAG,sCAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7E,IAAI,eAAe,EAAE;QACnB,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;YACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,eAAe;SACpE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,cAAc,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;AACxD,CAAC;AArBD,4CAqBC;AAED,KAAK,UAAU,cAAc,CAC3B,GAAoB,EACpB,mBAAwC;IAExC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,CAAC,CAAC;IAC9F,IAAI,MAAM,CAAC;IACX,GAAG;QACD,MAAM,GAAG,MAAM,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACtD,IAAI,MAAM,KAAK,sBAAc,EAAE;YAC7B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAE,OAAO,CAAC,qBAAa,CAAC,CAAC;YAClC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;gBACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,SAAS;gBAC/D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,KAAK;aAC1D,CAAC,CAAC;SACJ;KACF,QAAQ,MAAM,KAAK,sBAAc,EAAE;IACpC,IAAI,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACxD,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,MAAM;YAC5D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,KAAK;SAC1D,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,8BAAsB,EAAE,CAAC,CAAC;QAC3C,sCAAmB,CAAC,mBAAmB,CAAC,cAAc,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACtF,OAAO,KAAK,CAAC;KACd;IACD,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;QACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;QACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,KAAK;KAC1D,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,GAAoB,EACpB,mBAAwC;IAExC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,CAAC,CAAC;IAC9F,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC/D,IAAI,MAAM,KAAK,sBAAc,EAAE;QAC7B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAE,OAAO,CAAC,qBAAa,CAAC,CAAC;QAClC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,SAAS;YAC/D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,QAAQ;SAC7D,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,MAAM,KAAK,aAAa,EAAE;QACnC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;YACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,QAAQ;SAC7D,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,2BAA2B,CAAC,GAAoB;IAC7D,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,gCAAgC,CAAC,CAAC;IAC9F,MAAM,GAAG,GAAG,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACrC,MAAM,EACN,kCAAkB,CAAC,sCAAsC,CAAC,EAC1D,IAAI,EACJ,IAAI,CACL,CAAA,CAAC;IACF,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,KAAI,GAAG,CAAC,KAAK,KAAK,IAAI,EAAE;QACrC,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,EAAE;YACxD,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,WAAW;SAChE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;SAAM;QACL,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,2BAA2B,EAAE;YACvF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,sBAAsB,CAAC,MAAM;YAC5D,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,sBAAsB,CAAC,WAAW;SAChE,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,mBAAwC;IAExC,OAAO,MAAM,YAAY,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;AACvD,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,mBAAwC;IAExC,OAAO,MAAM,YAAY,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;AACxD,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,mBAAwC,EACxC,OAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,CAAA,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,EAAE,CAAC,WAAW,CACrC,MAAM,EACN,+CAA4B,CAAC,mBAAmB,CAAC,EACjD,OAAO,EACP,GAAG,uBAAuB,CAC3B,CAAA,CAAC;IACF,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,OAAwB;IAC3D,MAAM,WAAW,GAAG,sCAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;IACpE,IAAI;QACF,MAAM,SAAS,GAAG,MAAM,wCAAqB,CAAC,WAAW,CAAC,CAAC;QAC3D,mBAAmB,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;KACjE;IAAC,OAAO,KAAK,EAAE;QACd,yCAAyC;KAC1C;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,OAAyB;IAC9D,UAAU;IACV,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,EAAE;QAC3D,yBAAyB;QACzB,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,mCAAmC;QAC1G,KAAK,MAAM,QAAQ,IAAI,SAAS;YAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBAClC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,uCAAuC,EAAE,GAAG,CAAC,CAAC,CAAC,gBAAgB;gBAC5F,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,cAAc,IAAI,IAAI,EAAE;oBAC1B,cAAc;oBACd,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAClC,sCAAsC;oBACtC,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;oBAC/D,IACE,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAC1B,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC,EACF;wBACA,kBAAkB;wBAClB,MAAM,OAAO,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;wBACF,4BAA4B;wBAC5B,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,4BAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,4BAAU,CAAC,iBAAiB,EACnF,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;oBACD,MAAM,GAAG,GAAG,MAAM,+BAAY,CAC5B,OAAO,EACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC,CAC3D,CAAC;oBACF,IAAI,GAAG,CAAC,UAAU,CAAC,EAAE;wBACnB,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;wBACrD,MAAM,WAAW,GAAG,EAAE;6BACnB,YAAY,CACX,IAAI,CAAC,IAAI,CACP,OAAO,CAAC,WAAW,EACnB,4BAAU,CAAC,wBAAwB,EACnC,SAAS,CAAC,aAAa,GAAG,OAAO,CAClC,CACF;6BACA,QAAQ,EAAE;6BACV,QAAQ,CAAC,cAAc,CAAC;4BACzB,CAAC,CAAC,EAAE;4BACJ,CAAC,CAAC,cAAc,GAAG,OAAO,GAAG,QAAG,CAAC;wBACnC,4DAA4D;wBAC5D,MAAM,OAAO,GACX,WAAW;4BACX,2CAAwB,CACtB,GAAG,CAAC,UAAU,CAAC,EACf,WAAW,EACX,EAAE,EACF,yBAAQ,CAAC,MAAM,EACf,YAAY,CACb,CAAC;wBACJ,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,EACP,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;iBACF;aACF;KACJ;AACH,CAAC;AAnED,4CAmEC;AAEM,KAAK,UAAU,eAAe,CAAC,OAAyB;IAC7D,UAAU;IACV,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,EAAE;QAC1D,yBAAyB;QACzB,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,mCAAmC;QACzG,KAAK,MAAM,QAAQ,IAAI,SAAS;YAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;gBACjC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC,CAAC,eAAe;gBAC1F,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,IAAI,cAAc,IAAI,IAAI,EAAE;oBAC1B,cAAc;oBACd,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAClC,sCAAsC;oBACtC,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;oBAC/D,IACE,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAC1B,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC,EACF;wBACA,kBAAkB;wBAClB,MAAM,OAAO,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;wBACF,4BAA4B;wBAC5B,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,4BAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,4BAAU,CAAC,iBAAiB,EACnF,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;oBACD,MAAM,GAAG,GAAG,MAAM,+BAAY,CAC5B,OAAO,EACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC,CACzD,CAAC;oBACF,IAAI,GAAG,EAAE;wBACP,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;wBACrD,qBAAqB;wBACrB,MAAM,OAAO,GAAG,2CAAwB,CACtC,GAAG,EACH,QAAQ,EACR,EAAE,EACF,yBAAQ,CAAC,KAAK,EACd,YAAY,CACb,CAAC;wBACF,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,OAAO,EACP,SAAS,CAAC,cAAc,CACzB,CAAC;qBACH;iBACF;aACF;KACJ;AACH,CAAC;AArDD,0CAqDC;AAEM,KAAK,UAAU,iBAAiB,CAAC,OAAyB;IAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,YAAY,EAAE,4BAAU,CAAC,WAAW,CAAC,CAAC;IAC/E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE;QAC9C,OAAO;KACR;IACD,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG,gCAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,mCAAmC;IAC3F,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,OAAO,GAAG,4CAAyB,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,OAAO,EAAE;YACX,cAAc;YACd,MAAM,WAAW,GAAG,uCAAoB,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,YAAY,GAAG,MAAM,mCAAgB,CAAC,OAAO,CAAC,CAAC;YACrD,MAAM,OAAO,GACX,4BAAU,CAAC,iBAAiB;gBAC5B,QAAG;gBACH,4BAAU,CAAC,aAAa;gBACxB,CAAC,MAAM,yCAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;YAC3F,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,WAAW,CAAC,EAC3D,OAAO,EACP,SAAS,CAAC,cAAc,CACzB,CAAC;SACH;KACF;AACH,CAAC;AAzBD,8CAyBC;AAEM,KAAK,UAAU,cAAc,CAAC,OAAyB;IAC5D,2BAA2B;IAC3B,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAE9C,0BAA0B;IAC1B,MAAM,gBAAgB,GAAG,MAAM,2CAAmB,CAChD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,aAAa,CAAC,CACxD,CAAC;IACF,IAAI,CAAC,uCAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE;QACnF,6BAA6B;QAC7B,OAAO;KACR;IAED,6BAA6B;IAC7B,MAAM,gBAAgB,GAAG;QACvB,6CAA8B;QAC9B,2CAA4B;QAC5B,4CAA6B;QAC7B,8BAAe;QACf,8BAAe;QACf,8BAAe;QACf,qCAAsB;QACtB,uCAAwB;QACxB,0CAA2B;QAC3B,8CAA+B;QAC/B,mCAAoB;QACpB,+BAAgB;QAChB,8BAAe;QACf,kCAAmB;QACnB,kCAAmB;QACnB,mCAAoB;QACpB,gDAAiC;QACjC,oCAAqB;QACrB,uCAAwB;QACxB,wCAAyB;KAC1B,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,MAAM,mBAAmB,GAAG,MAAM,8CAAsB,CAAC,OAAO,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,IAAI,6CAAqB,CAC5C,OAAO,EACP,gBAAgB,CAAC,OAAO,CAAC,EACzB,kBAAkB,EAClB,mBAAmB,CACpB,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE;QACnC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;KAC1B;IAED,2BAA2B;IAC3B,MAAM,OAAO,CAAC,WAAW,CACvB,SAAS,CAAC,aAAa,EACvB,WAAW,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CACjD,CAAC;IAEF,yBAAyB;IACzB,MAAM,eAAe,GAAG,IAAI,2CAAoB,CAC9C,kBAAkB,EAClB,YAAY,CAAC,YAAY,EACzB,mBAAmB,CACpB,CAAC;IACF,MAAM,YAAY,GAAW,MAAM,eAAe,CAAC,cAAc,EAAE,CAAC;IACpE,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAjED,wCAiEC;AAED,SAAgB,qBAAqB,CAAC,UAAe;IACnD,IAAI,UAAU,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE;QAC1C,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,YAAY,CAAC;YACxC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,MAAM;gBAAE,OAAO,IAAI,CAAC;QAC/E,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AARD,sDAQC;AAEM,KAAK,UAAU,4BAA4B,CAAC,OAAyB;IAC1E,UAAU;IACV,IAAI,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,sBAAsB,CAAC,CAAC,EAAE;QACnF,MAAM,sBAAsB,GAAG,EAAE,CAAC,YAAY,CAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,sBAAsB,CAAC,CACzE,CAAC;QACF,8BAA8B;QAC9B,IAAI,qBAAqB,CAAC,sBAAsB,CAAC,EAAE;YACjD,MAAM,SAAS,GAAG,gCAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;YACtE,KAAK,MAAM,QAAQ,IAAI,SAAS;gBAC9B,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAClC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC,CAAC,gBAAgB;oBACxF,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAChD,IAAI,cAAc,IAAI,IAAI,EAAE;wBAC1B,cAAc;wBACd,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;wBAClC,IAAI,OAAO,IAAI,OAAO,EAAE;4BACtB,MAAM,OAAO,CAAC,WAAW,CAAC,4BAAU,CAAC,wBAAwB,CAAC,CAAC;4BAC/D,IACE,CAAC,CAAC,MAAM,OAAO,CAAC,YAAY,CAC1B,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;gCAEF,MAAM,OAAO,CAAC,YAAY,CACxB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,CAClF,CAAC;4BACJ,MAAM,uBAAuB,GAC3B,gKAAgK;gCAChK,QAAG;gCACH,uJAAuJ;gCACvJ,QAAG,CAAC;4BACN,MAAM,OAAO,CAAC,WAAW,CACvB,IAAI,CAAC,IAAI,CAAC,4BAAU,CAAC,wBAAwB,EAAE,SAAS,CAAC,aAAa,GAAG,OAAO,CAAC,EACjF,uBAAuB,EACvB,SAAS,CAAC,cAAc,CACzB,CAAC;yBACH;qBACF;iBACF;SACJ;KACF;AACH,CAAC;AAzCD,oEAyCC;AAEM,KAAK,UAAU,0BAA0B,CAAC,WAAmB;IAClE,IAAI;QACF,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;QAC1D,IAAI,eAAe,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,qBAAqB,EAAE;YACjF,OAAO,IAAI,CAAC;SACb;aAAM;YACL,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,6BAA6B,EAAE;gBACzF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,0BAA0B;aAC1D,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;KACF;IAAC,OAAO,KAAU,EAAE;QACnB,4BAA4B,CAAC,qBAAS,CAAC,IAAI,EAAE,0BAAc,CAAC,6BAA6B,EAAE;YACzF,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO;SAC7C,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAlBD,gEAkBC;AAEM,KAAK,UAAU,eAAe,CAAC,OAAyB;IAC7D,MAAM,aAAa,GAAG,YAAY,CAAC;IACnC,MAAM,eAAe,GAAY,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACrE,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;KAC3C;IAED,IAAI,iBAAiB,GAAW,MAAM,EAAE,CAAC,QAAQ,CAC/C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,EAC7C,MAAM,CACP,CAAC;IACF,iBAAiB,IAAI,QAAG,GAAG,GAAG,4BAAU,CAAC,wBAAwB,IAAI,uCAAoB,CAAC,GAAG,CAAC,EAAE,CAAC;IACjG,iBAAiB,IAAI,QAAG,GAAG,GAAG,4BAAU,CAAC,wBAAwB,IAAI,mCAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;IACjG,iBAAiB,IAAI,QAAG,GAAG,GAAG,+BAAY,IAAI,CAAC;IAC/C,iBAAiB,IAAI,QAAG,GAAG,yCAAiB,CAAC;IAE7C,MAAM,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;AAC9D,CAAC;AAjBD,0CAiBC;AAED,SAAS,4BAA4B,CACnC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;IAEtC,MAAM,gBAAgB,mCAAQ,UAAU,GAAK,mBAAmB,CAAE,CAAC;IACnE,8BAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,iCAAiC,CACxC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;IAEpC,MAAM,gBAAgB,mCAAQ,UAAU,GAAK,mBAAmB,CAAE,CAAC;IACnE,mCAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAC3E,CAAC"}
|
|
1
|
+
{"version":3,"file":"projectMigratorV3.js","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ function needToShowUpdateDialog(versionInfo) {
|
|
|
28
28
|
}
|
|
29
29
|
return false;
|
|
30
30
|
}
|
|
31
|
-
|
|
31
|
+
function showDialog(ctx) {
|
|
32
32
|
const lastArg = ctx.arguments[ctx.arguments.length - 1];
|
|
33
33
|
const inputs = lastArg === ctx ? ctx.arguments[ctx.arguments.length - 2] : lastArg;
|
|
34
34
|
if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
|
|
@@ -36,25 +36,25 @@ async function showDialog(ctx) {
|
|
|
36
36
|
const message = localizeUtils_1.getLocalizedString(messageKey);
|
|
37
37
|
globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigratorV3_1.moreInfoButton).then((res) => {
|
|
38
38
|
if (res.isOk() && res.value === projectMigratorV3_1.moreInfoButton) {
|
|
39
|
-
globalVars_1.TOOLS.ui.openUrl(versionMetadata_1.MetadataV2.updateToolkitLink);
|
|
39
|
+
void globalVars_1.TOOLS.ui.openUrl(versionMetadata_1.MetadataV2.updateToolkitLink);
|
|
40
40
|
}
|
|
41
|
-
});
|
|
42
|
-
return error_1.IncompatibleProjectError(messageKey);
|
|
41
|
+
}, () => { });
|
|
42
|
+
return Promise.resolve(error_1.IncompatibleProjectError(messageKey));
|
|
43
43
|
}
|
|
44
44
|
else if (inputs.platform === teamsfx_api_1.Platform.CLI) {
|
|
45
45
|
const messageKey = "core.projectVersionChecker.cliUseNewVersion";
|
|
46
46
|
globalVars_1.TOOLS.logProvider.warning(localizeUtils_1.getLocalizedString(messageKey));
|
|
47
|
-
return error_1.IncompatibleProjectError(messageKey);
|
|
47
|
+
return Promise.resolve(error_1.IncompatibleProjectError(messageKey));
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
const messageKey = "core.projectVersionChecker.vs.incompatibleProject";
|
|
51
51
|
const message = localizeUtils_1.getLocalizedString(messageKey);
|
|
52
52
|
globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigratorV3_1.moreInfoButton).then((res) => {
|
|
53
53
|
if (res.isOk() && res.value === projectMigratorV3_1.moreInfoButton) {
|
|
54
|
-
globalVars_1.TOOLS.ui.openUrl(projectMigratorV3_1.learnMoreLink);
|
|
54
|
+
void globalVars_1.TOOLS.ui.openUrl(projectMigratorV3_1.learnMoreLink);
|
|
55
55
|
}
|
|
56
|
-
});
|
|
57
|
-
return error_1.IncompatibleProjectError(messageKey);
|
|
56
|
+
}, () => { });
|
|
57
|
+
return Promise.resolve(error_1.IncompatibleProjectError(messageKey));
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
//# sourceMappingURL=projectVersionChecker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectVersionChecker.js","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAAwE;AACxE,4DAA4B;AAC5B,8DAAgE;AAChE,kEAAsF;AACtF,oCAAoD;AACpD,8CAAsC;AAEtC,2DAAoE;AACpE,+DAA6D;AAEtD,MAAM,uBAAuB,GAAe,KAAK,EACtD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,WAAW,GAAG,MAAM,oCAAiB,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,sBAAsB,CAAC,WAAW,CAAC,EAAE;QACvC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;QACrC,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO;KACR;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC;AAEF,SAAS,sBAAsB,CAAC,WAAwB;IACtD,IAAI,WAAW,CAAC,MAAM,KAAK,+BAAa,CAAC,QAAQ,IAAI,gBAAM,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QAC7F,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"projectVersionChecker.js","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appYmlGenerator.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAIxE,8BAAsB,mBAAmB;IAE3B,SAAS,CAAC,kBAAkB,EAAE,GAAG;IAD7C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;gBACpB,kBAAkB,EAAE,GAAG;cAE7B,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAM/E;AAED,qBAAa,eAAgB,SAAQ,mBAAmB;IAgBjB,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,WAAW;IAftF,SAAS,CAAC,iBAAiB,EAAE;QAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,aAAa,EAAE,OAAO,CAAC;QACvB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,YAAY,EAAE,OAAO,CAAC;QACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;QACxC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;QACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;KAC7B,CAAC;gBACU,kBAAkB,EAAE,GAAG,EAAU,YAAY,EAAE,MAAM,EAAU,WAAW,EAAE,MAAM;IAmBjF,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAqBjC,mBAAmB,CAAC,mBAAmB,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;YAgBjF,gCAAgC;
|
|
1
|
+
{"version":3,"file":"appYmlGenerator.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAIxE,8BAAsB,mBAAmB;IAE3B,SAAS,CAAC,kBAAkB,EAAE,GAAG;IAD7C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC;gBACpB,kBAAkB,EAAE,GAAG;cAE7B,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAM/E;AAED,qBAAa,eAAgB,SAAQ,mBAAmB;IAgBjB,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,WAAW;IAftF,SAAS,CAAC,iBAAiB,EAAE;QAC3B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5C,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;QACjC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,aAAa,EAAE,OAAO,CAAC;QACvB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,YAAY,EAAE,OAAO,CAAC;QACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;QACxC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;QACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;KAC7B,CAAC;gBACU,kBAAkB,EAAE,GAAG,EAAU,YAAY,EAAE,MAAM,EAAU,WAAW,EAAE,MAAM;IAmBjF,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAqBjC,mBAAmB,CAAC,mBAAmB,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;YAgBjF,gCAAgC;IA8C9C,OAAO,CAAC,8BAA8B;IAuCtC,OAAO,CAAC,qBAAqB;CAO9B"}
|
|
@@ -108,7 +108,7 @@ class AppYmlGenerator extends BaseAppYmlGenerator {
|
|
|
108
108
|
this.handlebarsContext.environmentFolder = versionMetadata_1.MetadataV3.defaultEnvironmentFolder;
|
|
109
109
|
this.handlebarsContext.isM365 = this.oldProjectSettings.isM365;
|
|
110
110
|
}
|
|
111
|
-
|
|
111
|
+
generateAzureHandlebarsContext() {
|
|
112
112
|
// isFunctionBot
|
|
113
113
|
const projectSettings = migrate_1.convertProjectSettingsV2ToV3(this.oldProjectSettings, this.projectPath);
|
|
114
114
|
// placeholders
|
|
@@ -137,6 +137,7 @@ class AppYmlGenerator extends BaseAppYmlGenerator {
|
|
|
137
137
|
this.handlebarsContext.botResourceId =
|
|
138
138
|
this.handlebarsContext.placeholderMappings[`${prefix}${outputContents[3]}`];
|
|
139
139
|
}
|
|
140
|
+
return Promise.resolve();
|
|
140
141
|
}
|
|
141
142
|
setPlaceholderMapping(placeholder) {
|
|
142
143
|
const result = MigrationUtils_1.namingConverterV3(placeholder, MigrationUtils_1.FileType.STATE, this.bicepContent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appYmlGenerator.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA8D;AAC9D,qDAA+D;AAC/D,mDAA6B;AAC7B,qDAA+B;AAC/B,+DAAyC;AACzC,4CAAqD;AAErD,qEAA6D;AAC7D,qFAAyE;AACzE,wDAA0E;AAC1E,MAAsB,mBAAmB;IAEvC,YAAsB,kBAAuB;QAAvB,uBAAkB,GAAlB,kBAAkB,CAAK;IAAG,CAAC;IAEvC,KAAK,CAAC,uBAAuB,CAAC,YAAoB;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;QACvF,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACpD,OAAO,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;CACF;AAVD,kDAUC;AAED,MAAa,eAAgB,SAAQ,mBAAmB;IAgBtD,YAAY,kBAAuB,EAAU,YAAoB,EAAU,WAAmB;QAC5F,KAAK,CAAC,kBAAkB,CAAC,CAAC;QADiB,iBAAY,GAAZ,YAAY,CAAQ;QAAU,gBAAW,GAAX,WAAW,CAAQ;QAE5F,IAAI,CAAC,iBAAiB,GAAG;YACvB,aAAa,EAAE,EAAE;YACjB,mBAAmB,EAAE,EAAE;YACvB,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,SAAS;YACvB,OAAO,EAAE,SAAS;YAClB,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE,SAAS;YACxB,YAAY,EAAE,KAAK;YACnB,mBAAmB,EAAE,SAAS;YAC9B,iBAAiB,EAAE,SAAS;YAC5B,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE,SAAS;SAClB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc;;QACzB,MAAM,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAE9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"appYmlGenerator.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/appYmlGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appLocalYmlGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/core/middleware/utils/debug/appLocalYmlGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,2DAA2D,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,iEAAiE,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAA4B,MAAM,yBAAyB,CAAC;AAE5F,qBAAa,iBAAiB;IAC5B,SAAS,EAAE;QACT,WAAW,CAAC,EAAE;YACZ,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,QAAQ,CAAC,EAAE,OAAO,CAAC;SACpB,CAAC;QACF,GAAG,CAAC,EAAE;YACJ,iBAAiB,EAAE,MAAM,CAAC;YAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;QACF,YAAY,CAAC,EAAE;YACb,GAAG,CAAC,EAAE;gBACJ,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;aACnB,CAAC;YACF,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,QAAQ,CAAC,EAAE;gBACT,cAAc,CAAC,EAAE,MAAM,CAAC;aACzB,CAAC;YACF,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;KACH,CAAM;IACP,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,eAAe,CAAC;QACxB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;QAC1B,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,GAAG,CAAC,EAAE;YACJ,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QACF,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,MAAM,CAAC,EAAE;YACP,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE;YACd,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,eAAe,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,QAAQ,CAAC,EAAE;YACT,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,GAAG,CAAC,EAAE,OAAO,CAAC;SACf,CAAC;QACF,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,qBAAa,oBAAqB,SAAQ,mBAAmB;IAC3D,SAAS,CAAC,iBAAiB,EAAE;QAC3B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,mBAAmB,EAAE,uBAAuB,CAAC;KAC9C,CAAC;gBAGA,kBAAkB,EAAE,GAAG,EACvB,MAAM,EAAE,iBAAiB,EACzB,mBAAmB,EAAE,uBAAuB;IASjC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"appLocalYmlGenerator.d.ts","sourceRoot":"","sources":["../../../../../src/core/middleware/utils/debug/appLocalYmlGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,2DAA2D,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,iEAAiE,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAA4B,MAAM,yBAAyB,CAAC;AAE5F,qBAAa,iBAAiB;IAC5B,SAAS,EAAE;QACT,WAAW,CAAC,EAAE;YACZ,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,QAAQ,CAAC,EAAE,OAAO,CAAC;SACpB,CAAC;QACF,GAAG,CAAC,EAAE;YACJ,iBAAiB,EAAE,MAAM,CAAC;YAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;QACF,YAAY,CAAC,EAAE;YACb,GAAG,CAAC,EAAE;gBACJ,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;aACnB,CAAC;YACF,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,QAAQ,CAAC,EAAE;gBACT,cAAc,CAAC,EAAE,MAAM,CAAC;aACzB,CAAC;YACF,MAAM,CAAC,EAAE,OAAO,CAAC;SAClB,CAAC;KACH,CAAM;IACP,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,eAAe,CAAC;QACxB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;QAC1B,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,GAAG,CAAC,EAAE;YACJ,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QACF,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,GAAG,CAAC,EAAE,OAAO,CAAC;QACd,MAAM,CAAC,EAAE;YACP,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE;YACd,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,SAAS,CAAC,EAAE;YACV,eAAe,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,QAAQ,CAAC,EAAE;YACT,GAAG,CAAC,EAAE,OAAO,CAAC;YACd,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,GAAG,CAAC,EAAE,OAAO,CAAC;SACf,CAAC;QACF,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,qBAAa,oBAAqB,SAAQ,mBAAmB;IAC3D,SAAS,CAAC,iBAAiB,EAAE;QAC3B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,mBAAmB,EAAE,uBAAuB,CAAC;KAC9C,CAAC;gBAGA,kBAAkB,EAAE,GAAG,EACvB,MAAM,EAAE,iBAAiB,EACzB,mBAAmB,EAAE,uBAAuB;IASjC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAY9C,OAAO,CAAC,0BAA0B;CAgCnC"}
|
|
@@ -21,7 +21,7 @@ class AppLocalYmlGenerator extends appYmlGenerator_1.BaseAppYmlGenerator {
|
|
|
21
21
|
}
|
|
22
22
|
async generateAppYml() {
|
|
23
23
|
var _a;
|
|
24
|
-
this.generateHandlerbarsContext();
|
|
24
|
+
await this.generateHandlerbarsContext();
|
|
25
25
|
switch ((_a = this.oldProjectSettings.programmingLanguage) === null || _a === void 0 ? void 0 : _a.toLowerCase()) {
|
|
26
26
|
case "javascript":
|
|
27
27
|
case "typescript":
|
|
@@ -30,7 +30,7 @@ class AppLocalYmlGenerator extends appYmlGenerator_1.BaseAppYmlGenerator {
|
|
|
30
30
|
return await this.buildHandlebarsTemplate("js.ts.app.local.yml");
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
-
|
|
33
|
+
generateHandlerbarsContext() {
|
|
34
34
|
var _a, _b, _c;
|
|
35
35
|
let functionName = undefined;
|
|
36
36
|
if (debugV3MigrationUtils_1.OldProjectSettingsHelper.includeFunction(this.oldProjectSettings)) {
|
|
@@ -56,6 +56,7 @@ class AppLocalYmlGenerator extends appYmlGenerator_1.BaseAppYmlGenerator {
|
|
|
56
56
|
this.handlebarsContext.config.deploy.ssoFunction = true;
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
|
+
return Promise.resolve();
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
62
|
exports.AppLocalYmlGenerator = AppLocalYmlGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appLocalYmlGenerator.js","sourceRoot":"","sources":["../../../../../src/core/middleware/utils/debug/appLocalYmlGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,wDAAyD;AACzD,mEAA4F;AAE5F,MAAa,iBAAiB;IAA9B;QACE,cAAS,GAoBL,EAAE,CAAC;IA6BT,CAAC;CAAA;AAlDD,8CAkDC;AAED,MAAa,oBAAqB,SAAQ,qCAAmB;IAM3D,YACE,kBAAuB,EACvB,MAAyB,EACzB,mBAA4C;QAE5C,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG;YACvB,MAAM,EAAE,MAAM;YACd,mBAAmB,EAAE,mBAAmB;SACzC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc;;QACzB,IAAI,CAAC,0BAA0B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"appLocalYmlGenerator.js","sourceRoot":"","sources":["../../../../../src/core/middleware/utils/debug/appLocalYmlGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,wDAAyD;AACzD,mEAA4F;AAE5F,MAAa,iBAAiB;IAA9B;QACE,cAAS,GAoBL,EAAE,CAAC;IA6BT,CAAC;CAAA;AAlDD,8CAkDC;AAED,MAAa,oBAAqB,SAAQ,qCAAmB;IAM3D,YACE,kBAAuB,EACvB,MAAyB,EACzB,mBAA4C;QAE5C,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC1B,IAAI,CAAC,iBAAiB,GAAG;YACvB,MAAM,EAAE,MAAM;YACd,mBAAmB,EAAE,mBAAmB;SACzC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,cAAc;;QACzB,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAExC,QAAQ,MAAA,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,0CAAE,WAAW,EAAE,EAAE;YAClE,KAAK,YAAY,CAAC;YAClB,KAAK,YAAY,CAAC;YAClB;gBACE,8BAA8B;gBAC9B,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,qBAAqB,CAAC,CAAC;SACpE;IACH,CAAC;IAEO,0BAA0B;;QAChC,IAAI,YAAY,GAAuB,SAAS,CAAC;QACjD,IAAI,gDAAwB,CAAC,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YACrE,YAAY;gBACV,gDAAwB,CAAC,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,gBAAgB,CAAC;SACzF;QAED,IAAI,MAAA,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,0CAAE,YAAY,EAAE;YACzD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;SAC9F;QAED,IAAI,MAAA,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,0CAAE,GAAG,EAAE;YAChD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;SACrF;QAED,IAAI,MAAA,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,0CAAE,GAAG,EAAE;YAC7C,IAAI,gDAAwB,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBAChE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG;oBAC5C,YAAY;iBACb,CAAC;aACH;YAED,IAAI,gDAAwB,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBAChE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;aACpD;YAED,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC;aACzD;SACF;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AA9DD,oDA8DC"}
|