@microsoft/teamsfx-core 2.0.0 → 2.0.1-alpha.6f92bb6f7.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/armInterface.d.ts +0 -5
- package/build/common/armInterface.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +0 -7
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts +0 -4
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +1 -9
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +0 -5
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +0 -6
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +2 -33
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +0 -31
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +0 -3
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +0 -3
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/depsError.d.ts +0 -9
- package/build/common/deps-checker/depsError.d.ts.map +1 -1
- package/build/common/deps-checker/depsError.js +1 -22
- package/build/common/deps-checker/depsError.js.map +1 -1
- package/build/common/deps-checker/depsManager.d.ts.map +1 -1
- package/build/common/deps-checker/depsManager.js +0 -3
- package/build/common/deps-checker/depsManager.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +2 -2
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +4 -2
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts +0 -20
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +1 -51
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/local/localEnvManager.d.ts +0 -9
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +0 -59
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +1 -7
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +5 -81
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/projectSettingsHelperV3.d.ts +0 -1
- package/build/common/projectSettingsHelperV3.d.ts.map +1 -1
- package/build/common/projectSettingsHelperV3.js +1 -10
- package/build/common/projectSettingsHelperV3.js.map +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +18 -40
- package/build/common/samples.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +1 -2
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +5 -70
- package/build/common/tools.js.map +1 -1
- package/build/component/code/utils.d.ts +1 -8
- package/build/component/code/utils.d.ts.map +1 -1
- package/build/component/code/utils.js +5 -144
- package/build/component/code/utils.js.map +1 -1
- package/build/component/constants.d.ts +3 -0
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +13 -2
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +7 -7
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +15 -179
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/debug/error.d.ts +0 -1
- package/build/component/debug/error.d.ts.map +1 -1
- package/build/component/debug/error.js +1 -11
- package/build/component/debug/error.js.map +1 -1
- package/build/component/debug/index.d.ts.map +1 -1
- package/build/component/debug/index.js +1 -25
- package/build/component/debug/index.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +2 -2
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +6 -20
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +2 -2
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.d.ts +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.d.ts.map +1 -1
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js +4 -2
- package/build/component/driver/devTool/error/dotnetInstallationUserError.js.map +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.d.ts +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.d.ts.map +1 -1
- package/build/component/driver/devTool/error/funcInstallationUserError.js +4 -2
- package/build/component/driver/devTool/error/funcInstallationUserError.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 +17 -24
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +2 -2
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +11 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +121 -4
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +0 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +1 -11
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +0 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +34 -18
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/feature/bot/question.d.ts.map +1 -1
- package/build/component/feature/bot/question.js +7 -16
- package/build/component/feature/bot/question.js.map +1 -1
- package/build/component/feature/sso.d.ts +0 -4
- package/build/component/feature/sso.d.ts.map +1 -1
- package/build/component/feature/sso.js +10 -144
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/question.d.ts +3 -64
- package/build/component/question.d.ts.map +1 -1
- package/build/component/question.js +61 -663
- package/build/component/question.js.map +1 -1
- package/build/component/registerService.d.ts +0 -14
- package/build/component/registerService.d.ts.map +1 -1
- package/build/component/registerService.js +0 -14
- package/build/component/registerService.js.map +1 -1
- package/build/component/resource/aadApp/aadApp.d.ts.map +1 -1
- package/build/component/resource/aadApp/aadApp.js +6 -24
- package/build/component/resource/aadApp/aadApp.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +1 -1
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.d.ts +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/resource/appManifest/utils/ManifestUtils.js +1 -9
- package/build/component/resource/appManifest/utils/ManifestUtils.js.map +1 -1
- package/build/component/resource/spfx/utils/questions.d.ts.map +1 -1
- package/build/component/resource/spfx/utils/questions.js +1 -4
- package/build/component/resource/spfx/utils/questions.js.map +1 -1
- package/build/component/utils/backupFiles.d.ts +2 -1
- package/build/component/utils/backupFiles.d.ts.map +1 -1
- package/build/component/utils/backupFiles.js +23 -3
- package/build/component/utils/backupFiles.js.map +1 -1
- package/build/component/utils/charsetUtils.d.ts +3 -0
- package/build/component/utils/charsetUtils.d.ts.map +1 -0
- package/build/component/utils/charsetUtils.js +241 -0
- package/build/component/utils/charsetUtils.js.map +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +4 -1
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/metadataUtil.d.ts.map +1 -1
- package/build/component/utils/metadataUtil.js +9 -7
- 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 +8 -7
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/settingsUtil.js +3 -3
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/component/utils.d.ts +1 -12
- package/build/component/utils.d.ts.map +1 -1
- package/build/component/utils.js +2 -225
- package/build/component/utils.js.map +1 -1
- package/build/component/workflow.d.ts +0 -1
- package/build/component/workflow.d.ts.map +1 -1
- package/build/component/workflow.js +1 -687
- package/build/component/workflow.js.map +1 -1
- package/build/core/FxCore.d.ts +26 -34
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +86 -654
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts +15 -9
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +105 -105
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.d.ts +1 -10
- package/build/core/middleware/envInfoLoaderV3.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.js +1 -207
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -0
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +7 -7
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.d.ts +1 -4
- package/build/core/middleware/projectSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +4 -58
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.d.ts.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +4 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts +0 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +8 -54
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.d.ts +0 -5
- package/build/core/middleware/utils/MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +1 -77
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/question.d.ts +2 -12
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +14 -236
- package/build/core/question.js.map +1 -1
- package/build/core/types.d.ts +3 -3
- package/build/core/types.d.ts.map +1 -1
- package/build/error/common.d.ts +9 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +39 -1
- package/build/error/common.js.map +1 -1
- package/build/error/script.d.ts +1 -1
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +3 -3
- package/build/error/script.js.map +1 -1
- package/build/index.d.ts +0 -2
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -4
- package/build/index.js.map +1 -1
- package/package.json +12 -28
- package/resource/package.nls.json +10 -97
- 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/build/common/deps-checker/internal/ngrokChecker.d.ts +0 -27
- package/build/common/deps-checker/internal/ngrokChecker.d.ts.map +0 -1
- package/build/common/deps-checker/internal/ngrokChecker.js +0 -222
- package/build/common/deps-checker/internal/ngrokChecker.js.map +0 -1
- package/build/component/connection/apimConfig.d.ts +0 -11
- package/build/component/connection/apimConfig.d.ts.map +0 -1
- package/build/component/connection/apimConfig.js +0 -44
- package/build/component/connection/apimConfig.js.map +0 -1
- package/build/component/connection/azureFunctionConfig.d.ts +0 -9
- package/build/component/connection/azureFunctionConfig.d.ts.map +0 -1
- package/build/component/connection/azureFunctionConfig.js +0 -25
- package/build/component/connection/azureFunctionConfig.js.map +0 -1
- package/build/component/connection/azureResourceConfig.d.ts +0 -11
- package/build/component/connection/azureResourceConfig.d.ts.map +0 -1
- package/build/component/connection/azureResourceConfig.js +0 -72
- package/build/component/connection/azureResourceConfig.js.map +0 -1
- package/build/component/connection/azureWebAppConfig.d.ts +0 -9
- package/build/component/connection/azureWebAppConfig.d.ts.map +0 -1
- package/build/component/connection/azureWebAppConfig.js +0 -25
- package/build/component/connection/azureWebAppConfig.js.map +0 -1
- package/build/component/coordinator/lifecycleStage.d.ts +0 -2
- package/build/component/coordinator/lifecycleStage.d.ts.map +0 -1
- package/build/component/coordinator/lifecycleStage.js +0 -23
- package/build/component/coordinator/lifecycleStage.js.map +0 -1
- package/build/component/core.d.ts +0 -65
- package/build/component/core.d.ts.map +0 -1
- package/build/component/core.js +0 -653
- package/build/component/core.js.map +0 -1
- package/build/component/debug/util/ngrok.d.ts +0 -6
- package/build/component/debug/util/ngrok.d.ts.map +0 -1
- package/build/component/debug/util/ngrok.js +0 -65
- package/build/component/debug/util/ngrok.js.map +0 -1
- package/build/component/feature/api/api.d.ts +0 -8
- package/build/component/feature/api/api.d.ts.map +0 -1
- package/build/component/feature/api/api.js +0 -188
- package/build/component/feature/api/api.js.map +0 -1
- package/build/component/feature/apiconnector/apiConnector.d.ts +0 -11
- package/build/component/feature/apiconnector/apiConnector.d.ts.map +0 -1
- package/build/component/feature/apiconnector/apiConnector.js +0 -43
- package/build/component/feature/apiconnector/apiConnector.js.map +0 -1
- package/build/component/feature/apim.d.ts +0 -8
- package/build/component/feature/apim.d.ts.map +0 -1
- package/build/component/feature/apim.js +0 -123
- package/build/component/feature/apim.js.map +0 -1
- package/build/component/feature/bot/bot.d.ts +0 -12
- package/build/component/feature/bot/bot.d.ts.map +0 -1
- package/build/component/feature/bot/bot.js +0 -309
- package/build/component/feature/bot/bot.js.map +0 -1
- package/build/component/feature/keyVault.d.ts +0 -16
- package/build/component/feature/keyVault.d.ts.map +0 -1
- package/build/component/feature/keyVault.js +0 -90
- package/build/component/feature/keyVault.js.map +0 -1
- package/build/component/feature/spfx.d.ts +0 -9
- package/build/component/feature/spfx.d.ts.map +0 -1
- package/build/component/feature/spfx.js +0 -121
- package/build/component/feature/spfx.js.map +0 -1
- package/build/component/feature/sql.d.ts +0 -10
- package/build/component/feature/sql.d.ts.map +0 -1
- package/build/component/feature/sql.js +0 -80
- package/build/component/feature/sql.js.map +0 -1
- package/build/component/feature/tab.d.ts +0 -10
- package/build/component/feature/tab.d.ts.map +0 -1
- package/build/component/feature/tab.js +0 -238
- package/build/component/feature/tab.js.map +0 -1
- package/build/component/resource/azureSql/actions/configure.d.ts +0 -15
- package/build/component/resource/azureSql/actions/configure.d.ts.map +0 -1
- package/build/component/resource/azureSql/actions/configure.js +0 -92
- package/build/component/resource/azureSql/actions/configure.js.map +0 -1
- package/build/component/resource/azureSql/actions/provision.d.ts +0 -10
- package/build/component/resource/azureSql/actions/provision.d.ts.map +0 -1
- package/build/component/resource/azureSql/actions/provision.js +0 -63
- package/build/component/resource/azureSql/actions/provision.js.map +0 -1
- package/build/component/resource/azureSql/actions/utils.d.ts +0 -12
- package/build/component/resource/azureSql/actions/utils.d.ts.map +0 -1
- package/build/component/resource/azureSql/actions/utils.js +0 -82
- package/build/component/resource/azureSql/actions/utils.js.map +0 -1
- package/build/component/resource/azureSql/azureSql.d.ts +0 -24
- package/build/component/resource/azureSql/azureSql.d.ts.map +0 -1
- package/build/component/resource/azureSql/azureSql.js +0 -75
- package/build/component/resource/azureSql/azureSql.js.map +0 -1
- package/build/component/resource/azureSql/clients/management.d.ts +0 -18
- package/build/component/resource/azureSql/clients/management.d.ts.map +0 -1
- package/build/component/resource/azureSql/clients/management.js +0 -124
- package/build/component/resource/azureSql/clients/management.js.map +0 -1
- package/build/component/resource/azureSql/clients/sql.d.ts +0 -13
- package/build/component/resource/azureSql/clients/sql.d.ts.map +0 -1
- package/build/component/resource/azureSql/clients/sql.js +0 -153
- package/build/component/resource/azureSql/clients/sql.js.map +0 -1
- package/build/component/resource/azureSql/config.d.ts +0 -7
- package/build/component/resource/azureSql/config.d.ts.map +0 -1
- package/build/component/resource/azureSql/config.js +0 -77
- package/build/component/resource/azureSql/config.js.map +0 -1
- package/build/component/resource/azureSql/constants.d.ts +0 -85
- package/build/component/resource/azureSql/constants.d.ts.map +0 -1
- package/build/component/resource/azureSql/constants.js +0 -95
- package/build/component/resource/azureSql/constants.js.map +0 -1
- package/build/component/resource/azureSql/errors.d.ts +0 -63
- package/build/component/resource/azureSql/errors.d.ts.map +0 -1
- package/build/component/resource/azureSql/errors.js +0 -107
- package/build/component/resource/azureSql/errors.js.map +0 -1
- package/build/component/resource/azureSql/index.d.ts +0 -2
- package/build/component/resource/azureSql/index.d.ts.map +0 -1
- package/build/component/resource/azureSql/index.js +0 -7
- package/build/component/resource/azureSql/index.js.map +0 -1
- package/build/component/resource/azureSql/questions.d.ts +0 -6
- package/build/component/resource/azureSql/questions.d.ts.map +0 -1
- package/build/component/resource/azureSql/questions.js +0 -59
- package/build/component/resource/azureSql/questions.js.map +0 -1
- package/build/component/resource/azureSql/results.d.ts +0 -10
- package/build/component/resource/azureSql/results.d.ts.map +0 -1
- package/build/component/resource/azureSql/results.js +0 -34
- package/build/component/resource/azureSql/results.js.map +0 -1
- package/build/component/resource/azureSql/types.d.ts +0 -12
- package/build/component/resource/azureSql/types.d.ts.map +0 -1
- package/build/component/resource/azureSql/types.js +0 -5
- package/build/component/resource/azureSql/types.js.map +0 -1
- package/build/component/resource/azureSql/utils/checkInput.d.ts +0 -10
- package/build/component/resource/azureSql/utils/checkInput.d.ts.map +0 -1
- package/build/component/resource/azureSql/utils/checkInput.js +0 -89
- package/build/component/resource/azureSql/utils/checkInput.js.map +0 -1
- package/build/component/resource/azureSql/utils/common.d.ts +0 -12
- package/build/component/resource/azureSql/utils/common.d.ts.map +0 -1
- package/build/component/resource/azureSql/utils/common.js +0 -51
- package/build/component/resource/azureSql/utils/common.js.map +0 -1
- package/build/component/resource/identity.d.ts +0 -28
- package/build/component/resource/identity.d.ts.map +0 -1
- package/build/component/resource/identity.js +0 -42
- package/build/component/resource/identity.js.map +0 -1
- package/build/component/resource/keyVault.d.ts +0 -29
- package/build/component/resource/keyVault.d.ts.map +0 -1
- package/build/component/resource/keyVault.js +0 -47
- package/build/component/resource/keyVault.js.map +0 -1
- package/build/component/resource/simpleAuth/constants.d.ts +0 -122
- package/build/component/resource/simpleAuth/constants.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/constants.js +0 -163
- package/build/component/resource/simpleAuth/constants.js.map +0 -1
- package/build/component/resource/simpleAuth/errors.d.ts +0 -17
- package/build/component/resource/simpleAuth/errors.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/errors.js +0 -91
- package/build/component/resource/simpleAuth/errors.js.map +0 -1
- package/build/component/resource/simpleAuth/index.d.ts +0 -12
- package/build/component/resource/simpleAuth/index.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/index.js +0 -115
- package/build/component/resource/simpleAuth/index.js.map +0 -1
- package/build/component/resource/simpleAuth/result.d.ts +0 -9
- package/build/component/resource/simpleAuth/result.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/result.js +0 -35
- package/build/component/resource/simpleAuth/result.js.map +0 -1
- package/build/component/resource/simpleAuth/utils/common.d.ts +0 -23
- package/build/component/resource/simpleAuth/utils/common.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/utils/common.js +0 -150
- package/build/component/resource/simpleAuth/utils/common.js.map +0 -1
- package/build/component/resource/simpleAuth/utils/dialog.d.ts +0 -5
- package/build/component/resource/simpleAuth/utils/dialog.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/utils/dialog.js +0 -7
- package/build/component/resource/simpleAuth/utils/dialog.js.map +0 -1
- package/build/component/resource/simpleAuth/utils/telemetry.d.ts +0 -17
- package/build/component/resource/simpleAuth/utils/telemetry.d.ts.map +0 -1
- package/build/component/resource/simpleAuth/utils/telemetry.js +0 -45
- package/build/component/resource/simpleAuth/utils/telemetry.js.map +0 -1
- package/build/core/dependencyChecker.d.ts +0 -1
- package/build/core/dependencyChecker.d.ts.map +0 -1
- package/build/core/dependencyChecker.js +0 -2
- package/build/core/dependencyChecker.js.map +0 -1
- package/build/core/middleware/CommonErrorHandlerMW.d.ts +0 -14
- package/build/core/middleware/CommonErrorHandlerMW.d.ts.map +0 -1
- package/build/core/middleware/CommonErrorHandlerMW.js +0 -63
- package/build/core/middleware/CommonErrorHandlerMW.js.map +0 -1
- package/build/core/middleware/aadManifestMigration.d.ts +0 -3
- package/build/core/middleware/aadManifestMigration.d.ts.map +0 -1
- package/build/core/middleware/aadManifestMigration.js +0 -119
- package/build/core/middleware/aadManifestMigration.js.map +0 -1
- package/build/core/middleware/consolidateLocalRemote.d.ts +0 -5
- package/build/core/middleware/consolidateLocalRemote.d.ts.map +0 -1
- package/build/core/middleware/consolidateLocalRemote.js +0 -378
- package/build/core/middleware/consolidateLocalRemote.js.map +0 -1
- package/build/core/middleware/envInfoWriter.d.ts +0 -8
- package/build/core/middleware/envInfoWriter.d.ts.map +0 -1
- package/build/core/middleware/envInfoWriter.js +0 -76
- package/build/core/middleware/envInfoWriter.js.map +0 -1
- package/build/core/middleware/envInfoWriterV3.d.ts +0 -6
- package/build/core/middleware/envInfoWriterV3.d.ts.map +0 -1
- package/build/core/middleware/envInfoWriterV3.js +0 -67
- package/build/core/middleware/envInfoWriterV3.js.map +0 -1
- package/build/core/middleware/projectMigrator.d.ts +0 -40
- package/build/core/middleware/projectMigrator.d.ts.map +0 -1
- package/build/core/middleware/projectMigrator.js +0 -1014
- package/build/core/middleware/projectMigrator.js.map +0 -1
- package/build/core/middleware/projectSettingsWriter.d.ts +0 -6
- package/build/core/middleware/projectSettingsWriter.d.ts.map +0 -1
- package/build/core/middleware/projectSettingsWriter.js +0 -52
- package/build/core/middleware/projectSettingsWriter.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"baseBuildDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAW,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK1D,8BAAsB,eAAe;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC/C,MAAM,CAAC,QAAQ,CAAC,QAAQ,sBAA6B;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM;IAcpE,SAAS,CAAC,MAAM,CAAC,WAAW,8DAIzB;IAEH,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;IAInE,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;IA8BrC,UAAU,IAAI,MAAM;CAIrB"}
|
|
@@ -8,11 +8,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
8
8
|
exports.BaseBuildDriver = void 0;
|
|
9
9
|
const tslib_1 = require("tslib");
|
|
10
10
|
const common_1 = require("../../utils/common");
|
|
11
|
-
const utils_1 = require("../../code/utils");
|
|
12
11
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
13
12
|
const path = tslib_1.__importStar(require("path"));
|
|
14
13
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
15
14
|
const messages_1 = require("../../messages");
|
|
15
|
+
const scriptDriver_1 = require("./scriptDriver");
|
|
16
16
|
class BaseBuildDriver {
|
|
17
17
|
constructor(args, context, helpLink) {
|
|
18
18
|
var _a;
|
|
@@ -40,7 +40,7 @@ class BaseBuildDriver {
|
|
|
40
40
|
env = { PATH: `${this.execPath}${path.delimiter}${process.env.PATH}` };
|
|
41
41
|
}
|
|
42
42
|
await ((_a = this.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.runCommand(command, this.workingDirectory)));
|
|
43
|
-
const res = await
|
|
43
|
+
const res = await scriptDriver_1.executeCommand(command, this.context.projectPath, this.logProvider, this.context.ui, this.workingDirectory, env);
|
|
44
44
|
if (res.isErr()) {
|
|
45
45
|
return {
|
|
46
46
|
result: teamsfx_api_1.err(res.error),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAGH,+CAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"baseBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/baseBuildDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,22 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
/**
|
|
2
3
|
* @author huajiezhang <huajiezhang@microsoft.com>
|
|
3
4
|
*/
|
|
4
|
-
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
5
|
+
import { FxError, Result, LogProvider } from "@microsoft/teamsfx-api";
|
|
5
6
|
import { DriverContext } from "../interface/commonArgs";
|
|
6
7
|
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
8
|
+
import { DotenvOutput } from "../../utils/envUtil";
|
|
9
|
+
import { ScriptExecutionError, ScriptTimeoutError } from "../../../error/script";
|
|
10
|
+
import child_process from "child_process";
|
|
7
11
|
export declare class ScriptDriver implements StepDriver {
|
|
8
12
|
run(args: unknown, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
9
13
|
execute(args: unknown, ctx: DriverContext): Promise<ExecutionResult>;
|
|
10
14
|
}
|
|
11
15
|
export declare const scriptDriver: ScriptDriver;
|
|
16
|
+
export declare function executeCommand(command: string, projectPath: string, logProvider: LogProvider, ui: DriverContext["ui"], workingDirectory?: string, env?: NodeJS.ProcessEnv, shell?: string, timeout?: number, redirectTo?: string): Promise<Result<[string, DotenvOutput], FxError>>;
|
|
17
|
+
export declare function bufferToString(data: Buffer, systemEncoding: string): string;
|
|
18
|
+
export declare function convertScriptErrorToFxError(error: child_process.ExecException, run: string): ScriptTimeoutError | ScriptExecutionError;
|
|
19
|
+
export declare function parseSetOutputCommand(stdout: string): DotenvOutput;
|
|
20
|
+
export declare function maskSecretValues(stdout: string): string;
|
|
21
|
+
export declare function capitalizeFirstLetter(raw: string): string;
|
|
12
22
|
//# sourceMappingURL=scriptDriver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAMjF,OAAO,aAAa,MAAM,eAAe,CAAC;AAY1C,qBACa,YAAa,YAAW,UAAU;IAEvC,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAuBzF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAO3E;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC;AAE/C,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,WAAW,EACxB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAiElD;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,aAAa,CAAC,aAAa,EAClC,GAAG,EAAE,MAAM,GACV,kBAAkB,GAAG,oBAAoB,CAM3C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAYlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEzD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.scriptDriver = exports.ScriptDriver = void 0;
|
|
3
|
+
exports.capitalizeFirstLetter = exports.maskSecretValues = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
/**
|
|
6
6
|
* @author huajiezhang <huajiezhang@microsoft.com>
|
|
@@ -10,15 +10,21 @@ const typedi_1 = require("typedi");
|
|
|
10
10
|
const hooks_1 = require("@feathersjs/hooks");
|
|
11
11
|
const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
|
|
12
12
|
const commonConstant_1 = require("../../constant/commonConstant");
|
|
13
|
-
const utils_1 = require("../../code/utils");
|
|
14
13
|
const messages_1 = require("../../messages");
|
|
14
|
+
const script_1 = require("../../../error/script");
|
|
15
|
+
const charsetUtils_1 = require("../../utils/charsetUtils");
|
|
16
|
+
const path = tslib_1.__importStar(require("path"));
|
|
17
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
18
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
19
|
+
const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
|
|
20
|
+
const child_process_1 = tslib_1.__importDefault(require("child_process"));
|
|
15
21
|
const ACTION_NAME = "script";
|
|
16
22
|
let ScriptDriver = class ScriptDriver {
|
|
17
23
|
async run(args, context) {
|
|
18
24
|
var _a, _b;
|
|
19
25
|
const typedArgs = args;
|
|
20
26
|
await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.runCommand(typedArgs.run, (_b = typedArgs.workingDirectory) !== null && _b !== void 0 ? _b : "./")));
|
|
21
|
-
const res = await
|
|
27
|
+
const res = await executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
|
|
22
28
|
if (res.isErr())
|
|
23
29
|
return teamsfx_api_1.err(res.error);
|
|
24
30
|
const outputs = res.value[1];
|
|
@@ -28,7 +34,7 @@ let ScriptDriver = class ScriptDriver {
|
|
|
28
34
|
async execute(args, ctx) {
|
|
29
35
|
const res = await this.run(args, ctx);
|
|
30
36
|
const summaries = res.isOk()
|
|
31
|
-
? [`Successfully executed command ${
|
|
37
|
+
? [`Successfully executed command ${maskSecretValues(args.run)}`]
|
|
32
38
|
: [];
|
|
33
39
|
return { result: res, summaries: summaries };
|
|
34
40
|
}
|
|
@@ -50,4 +56,115 @@ ScriptDriver = tslib_1.__decorate([
|
|
|
50
56
|
], ScriptDriver);
|
|
51
57
|
exports.ScriptDriver = ScriptDriver;
|
|
52
58
|
exports.scriptDriver = new ScriptDriver();
|
|
59
|
+
async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
|
|
60
|
+
return new Promise(async (resolve, reject) => {
|
|
61
|
+
var _a, _b;
|
|
62
|
+
const platform = os_1.default.platform();
|
|
63
|
+
let workingDir = workingDirectory || ".";
|
|
64
|
+
workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
|
|
65
|
+
if (platform === "win32") {
|
|
66
|
+
workingDir = capitalizeFirstLetter(path.resolve(workingDir !== null && workingDir !== void 0 ? workingDir : ""));
|
|
67
|
+
}
|
|
68
|
+
// const defaultOsToShellMap: any = {
|
|
69
|
+
// win32: "powershell",
|
|
70
|
+
// darwin: "bash",
|
|
71
|
+
// linux: "bash",
|
|
72
|
+
// };
|
|
73
|
+
let run = command;
|
|
74
|
+
// shell = shell || defaultOsToShellMap[platform] || "pwsh";
|
|
75
|
+
let appendFile = undefined;
|
|
76
|
+
if (redirectTo) {
|
|
77
|
+
appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
|
|
78
|
+
}
|
|
79
|
+
if (shell === "cmd") {
|
|
80
|
+
run = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
|
|
81
|
+
}
|
|
82
|
+
await logProvider.info(`Start to run command: "${command}" on path: "${workingDir}".`);
|
|
83
|
+
const allOutputStrings = [];
|
|
84
|
+
const systemEncoding = await charsetUtils_1.getSystemEncoding();
|
|
85
|
+
const stderrStrings = [];
|
|
86
|
+
const cp = child_process_1.default.exec(run, {
|
|
87
|
+
shell: shell,
|
|
88
|
+
cwd: workingDir,
|
|
89
|
+
encoding: "buffer",
|
|
90
|
+
env: Object.assign(Object.assign({}, process.env), env),
|
|
91
|
+
timeout: timeout,
|
|
92
|
+
}, async (error) => {
|
|
93
|
+
if (error) {
|
|
94
|
+
error.message = stderrStrings.join("").trim() || error.message;
|
|
95
|
+
resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, run)));
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
// handle '::set-output' or '::set-teamsfx-env' pattern
|
|
99
|
+
const outputString = allOutputStrings.join("");
|
|
100
|
+
const outputObject = parseSetOutputCommand(outputString);
|
|
101
|
+
resolve(teamsfx_api_1.ok([outputString, outputObject]));
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
const dataHandler = (data) => {
|
|
105
|
+
if (appendFile) {
|
|
106
|
+
fs_extra_1.default.appendFileSync(appendFile, data);
|
|
107
|
+
}
|
|
108
|
+
allOutputStrings.push(data);
|
|
109
|
+
};
|
|
110
|
+
(_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
|
|
111
|
+
const str = bufferToString(data, systemEncoding);
|
|
112
|
+
logProvider.info(` [script action stdout] ${maskSecretValues(str)}`);
|
|
113
|
+
dataHandler(str);
|
|
114
|
+
});
|
|
115
|
+
(_b = cp.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
|
|
116
|
+
const str = bufferToString(data, systemEncoding);
|
|
117
|
+
logProvider.warning(` [script action stderr] ${maskSecretValues(str)}`);
|
|
118
|
+
dataHandler(str);
|
|
119
|
+
stderrStrings.push(str);
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
exports.executeCommand = executeCommand;
|
|
124
|
+
function bufferToString(data, systemEncoding) {
|
|
125
|
+
const str = systemEncoding === "utf8" || systemEncoding === "utf-8"
|
|
126
|
+
? data.toString()
|
|
127
|
+
: iconv_lite_1.default.decode(data, systemEncoding);
|
|
128
|
+
return str;
|
|
129
|
+
}
|
|
130
|
+
exports.bufferToString = bufferToString;
|
|
131
|
+
function convertScriptErrorToFxError(error, run) {
|
|
132
|
+
if (error.killed) {
|
|
133
|
+
return new script_1.ScriptTimeoutError(run);
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
return new script_1.ScriptExecutionError(run, error.message);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
|
|
140
|
+
function parseSetOutputCommand(stdout) {
|
|
141
|
+
const regex = /(::set-teamsfx-env|::set-output)\s+([^"'\s]+)=([^"'\s]+)/g;
|
|
142
|
+
const output = {};
|
|
143
|
+
let match;
|
|
144
|
+
while ((match = regex.exec(stdout))) {
|
|
145
|
+
if (match && match.length === 4) {
|
|
146
|
+
const key = match[2].trim();
|
|
147
|
+
const value = match[3].trim();
|
|
148
|
+
output[key] = value;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return output;
|
|
152
|
+
}
|
|
153
|
+
exports.parseSetOutputCommand = parseSetOutputCommand;
|
|
154
|
+
function maskSecretValues(stdout) {
|
|
155
|
+
for (const key of Object.keys(process.env)) {
|
|
156
|
+
if (key.startsWith("SECRET_")) {
|
|
157
|
+
const value = process.env[key];
|
|
158
|
+
if (value) {
|
|
159
|
+
stdout = stdout.replace(value, "***");
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
return stdout;
|
|
164
|
+
}
|
|
165
|
+
exports.maskSecretValues = maskSecretValues;
|
|
166
|
+
function capitalizeFirstLetter(raw) {
|
|
167
|
+
return raw.charAt(0).toUpperCase() + raw.slice(1);
|
|
168
|
+
}
|
|
169
|
+
exports.capitalizeFirstLetter = capitalizeFirstLetter;
|
|
53
170
|
//# sourceMappingURL=scriptDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;;AAAA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ export declare class CreateAppPackageDriver implements StepDriver {
|
|
|
9
9
|
run(args: CreateAppPackageArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
10
10
|
execute(args: CreateAppPackageArgs, context: DriverContext): Promise<ExecutionResult>;
|
|
11
11
|
build(args: CreateAppPackageArgs, context: WrapDriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
12
|
-
private loadCurrentState;
|
|
13
12
|
private validateArgs;
|
|
14
13
|
}
|
|
15
14
|
//# sourceMappingURL=createAppPackage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA6B,MAAM,wBAAwB,CAAC;AAEpF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAQzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IAE1E,GAAG,CACd,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IA4HhD,OAAO,CAAC,YAAY;CAuBrB"}
|
|
@@ -41,12 +41,11 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
41
41
|
if (result.isErr()) {
|
|
42
42
|
return teamsfx_api_1.err(result.error);
|
|
43
43
|
}
|
|
44
|
-
const state = this.loadCurrentState();
|
|
45
44
|
let manifestPath = args.manifestPath;
|
|
46
45
|
if (!path.isAbsolute(manifestPath)) {
|
|
47
46
|
manifestPath = path.join(context.projectPath, manifestPath);
|
|
48
47
|
}
|
|
49
|
-
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestPath
|
|
48
|
+
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestPath);
|
|
50
49
|
if (manifestRes.isErr()) {
|
|
51
50
|
return teamsfx_api_1.err(manifestRes.error);
|
|
52
51
|
}
|
|
@@ -129,15 +128,6 @@ let CreateAppPackageDriver = class CreateAppPackageDriver {
|
|
|
129
128
|
}
|
|
130
129
|
return teamsfx_api_1.ok(new Map());
|
|
131
130
|
}
|
|
132
|
-
loadCurrentState() {
|
|
133
|
-
return {
|
|
134
|
-
TAB_ENDPOINT: process.env.TAB_ENDPOINT,
|
|
135
|
-
TAB_DOMAIN: process.env.TAB_DOMAIN,
|
|
136
|
-
BOT_ID: process.env.BOT_ID,
|
|
137
|
-
BOT_DOMAIN: process.env.BOT_DOMAIN,
|
|
138
|
-
ENV_NAME: process.env.TEAMSFX_ENV,
|
|
139
|
-
};
|
|
140
|
-
}
|
|
141
131
|
validateArgs(args) {
|
|
142
132
|
const invalidParams = [];
|
|
143
133
|
if (!args || !args.manifestPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,gEAA0B;AAC1B,8DAA6B;AAC7B,mDAA6B;AAC7B,+CAA8C;
|
|
1
|
+
{"version":3,"file":"createAppPackage.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ export declare class ValidateManifestDriver implements StepDriver {
|
|
|
8
8
|
run(args: ValidateManifestArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
9
9
|
execute(args: ValidateManifestArgs, context: DriverContext): Promise<ExecutionResult>;
|
|
10
10
|
validate(args: ValidateManifestArgs, context: WrapDriverContext): Promise<Result<Map<string, string>, FxError>>;
|
|
11
|
-
private loadCurrentState;
|
|
12
11
|
private validateArgs;
|
|
13
12
|
}
|
|
14
13
|
//# sourceMappingURL=validate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,OAAO,EAA2C,MAAM,wBAAwB,CAAC;AAIlG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAezE,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAoE;IAElE,GAAG,CACd,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAMnC,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,QAAQ,CACnB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAiHhD,OAAO,CAAC,YAAY;CAYrB"}
|
|
@@ -39,14 +39,13 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
41
|
async validate(args, context) {
|
|
42
|
-
var _a, _b, _c;
|
|
42
|
+
var _a, _b, _c, _d;
|
|
43
43
|
telemetry_1.TelemetryUtils.init(context);
|
|
44
44
|
const result = this.validateArgs(args);
|
|
45
45
|
if (result.isErr()) {
|
|
46
46
|
return teamsfx_api_1.err(result.error);
|
|
47
47
|
}
|
|
48
|
-
const
|
|
49
|
-
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(common_1.getAbsolutePath(args.manifestPath, context.projectPath), state);
|
|
48
|
+
const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(common_1.getAbsolutePath(args.manifestPath, context.projectPath));
|
|
50
49
|
if (manifestRes.isErr()) {
|
|
51
50
|
return teamsfx_api_1.err(manifestRes.error);
|
|
52
51
|
}
|
|
@@ -69,14 +68,36 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
69
68
|
}
|
|
70
69
|
if (validationResult.length > 0) {
|
|
71
70
|
const summaryStr = localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.failed", validationResult.length);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
71
|
+
if (context.platform === teamsfx_api_1.Platform.CLI) {
|
|
72
|
+
const outputMessage = [
|
|
73
|
+
{
|
|
74
|
+
content: "Teams Toolkit has checked manifest with its schema:\n\nSummary: \n",
|
|
75
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
content: `${validationResult.length} failed.\n`,
|
|
79
|
+
color: teamsfx_api_1.Colors.BRIGHT_RED,
|
|
80
|
+
},
|
|
81
|
+
];
|
|
82
|
+
validationResult.map((error) => {
|
|
83
|
+
outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
|
|
84
|
+
outputMessage.push({
|
|
85
|
+
content: `${error}\n`,
|
|
86
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
(_a = context.ui) === null || _a === void 0 ? void 0 : _a.showMessage("info", outputMessage, false);
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
// logs in output window
|
|
93
|
+
const errors = validationResult
|
|
94
|
+
.map((error) => {
|
|
95
|
+
return `${constant_1.SummaryConstant.Failed} ${error}`;
|
|
96
|
+
})
|
|
97
|
+
.join(os_1.EOL);
|
|
98
|
+
const outputMessage = os_1.EOL + localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateManifest", summaryStr, errors);
|
|
99
|
+
(_b = context.logProvider) === null || _b === void 0 ? void 0 : _b.info(outputMessage);
|
|
100
|
+
}
|
|
80
101
|
return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, [
|
|
81
102
|
localizeUtils_1.getDefaultString("driver.teamsApp.validate.result", summaryStr),
|
|
82
103
|
localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result.display", summaryStr),
|
|
@@ -86,22 +107,17 @@ let ValidateManifestDriver = class ValidateManifestDriver {
|
|
|
86
107
|
// logs in output window
|
|
87
108
|
const summaryStr = localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.succeed", localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validate.all"));
|
|
88
109
|
const outputMessage = os_1.EOL + localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateManifest", summaryStr, "");
|
|
89
|
-
(
|
|
110
|
+
(_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.info(outputMessage);
|
|
90
111
|
const validationSuccess = localizeUtils_1.getLocalizedString("driver.teamsApp.validate.result.display", summaryStr);
|
|
91
112
|
if (context.platform === teamsfx_api_1.Platform.VS) {
|
|
92
113
|
context.logProvider.info(validationSuccess);
|
|
93
114
|
}
|
|
94
115
|
if (args.showMessage) {
|
|
95
|
-
(
|
|
116
|
+
(_d = context.ui) === null || _d === void 0 ? void 0 : _d.showMessage("info", validationSuccess, false);
|
|
96
117
|
}
|
|
97
118
|
return teamsfx_api_1.ok(new Map());
|
|
98
119
|
}
|
|
99
120
|
}
|
|
100
|
-
loadCurrentState() {
|
|
101
|
-
return {
|
|
102
|
-
ENV_NAME: process.env.TEAMSFX_ENV,
|
|
103
|
-
};
|
|
104
|
-
}
|
|
105
121
|
validateArgs(args) {
|
|
106
122
|
if (!args || !args.manifestPath) {
|
|
107
123
|
return teamsfx_api_1.err(new common_2.InvalidActionInputError(actionName, ["manifestPath"], "https://aka.ms/teamsfx-actions/teamsapp-validate"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/component/feature/bot/question.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAI5F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAuC,MAAM,aAAa,CAAC;AAEvF,aAAK,QAAQ;IACX,UAAU,gBAAgB;IAC1B,SAAS,oBAAoB;CAC9B;AAED,MAAM,WAAW,yBAA0B,SAAQ,UAAU;IAC3D,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAClC;AAGD,wBAAgB,+BAA+B,IAAI,yBAAyB,CAU3E;AAED,wBAAgB,sCAAsC,IAAI,yBAAyB,CAUlF;AAED,wBAAgB,8BAA8B,IAAI,yBAAyB,CAU1E;AAED,wBAAgB,oBAAoB,IAAI,yBAAyB,CAShE;AAGD,wBAAgB,yBAAyB,IAAI,yBAAyB,CASrE;AAED,wBAAgB,oBAAoB,IAAI,yBAAyB,EAAE,CAMlE;AAUD,wBAAgB,6BAA6B,CAC3C,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,OAAO,GAChB,oBAAoB,CAsBtB;AAID,eAAO,MAAM,gCAAgC;uBACxB,OAAO,kCAAoB,MAAM,GAAG,SAAS;;
|
|
1
|
+
{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/component/feature/bot/question.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAI5F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAuC,MAAM,aAAa,CAAC;AAEvF,aAAK,QAAQ;IACX,UAAU,gBAAgB;IAC1B,SAAS,oBAAoB;CAC9B;AAED,MAAM,WAAW,yBAA0B,SAAQ,UAAU;IAC3D,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAClC;AAGD,wBAAgB,+BAA+B,IAAI,yBAAyB,CAU3E;AAED,wBAAgB,sCAAsC,IAAI,yBAAyB,CAUlF;AAED,wBAAgB,8BAA8B,IAAI,yBAAyB,CAU1E;AAED,wBAAgB,oBAAoB,IAAI,yBAAyB,CAShE;AAGD,wBAAgB,yBAAyB,IAAI,yBAAyB,CASrE;AAED,wBAAgB,oBAAoB,IAAI,yBAAyB,EAAE,CAMlE;AAUD,wBAAgB,6BAA6B,CAC3C,QAAQ,CAAC,EAAE,QAAQ,EACnB,OAAO,CAAC,EAAE,OAAO,GAChB,oBAAoB,CAsBtB;AAID,eAAO,MAAM,gCAAgC;uBACxB,OAAO,kCAAoB,MAAM,GAAG,SAAS;;CAiBjE,CAAC;AAEF,wBAAgB,yCAAyC,CAAC,OAAO,EAAE,OAAO;uBAE7C,OAAO;EAQnC"}
|
|
@@ -4,7 +4,6 @@ exports.getConditionOfNotificationTriggerQuestion = exports.showNotificationTrig
|
|
|
4
4
|
// Copyright (c) Microsoft Corporation.
|
|
5
5
|
// Licensed under the MIT license.
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
|
-
const featureFlags_1 = require("../../../common/featureFlags");
|
|
8
7
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
9
8
|
const constants_1 = require("../../constants");
|
|
10
9
|
const constants_2 = require("../../constants");
|
|
@@ -114,22 +113,14 @@ exports.showNotificationTriggerCondition = {
|
|
|
114
113
|
if (!inputs) {
|
|
115
114
|
return "Invalid inputs";
|
|
116
115
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
return undefined;
|
|
121
|
-
}
|
|
122
|
-
// Single Select Option for "Add Feature"
|
|
123
|
-
const feature = inputs[constants_1.AzureSolutionQuestionNames.Features];
|
|
124
|
-
if (feature === constants_1.NotificationOptionItem().id) {
|
|
125
|
-
return undefined;
|
|
126
|
-
}
|
|
116
|
+
const cap = inputs[constants_1.AzureSolutionQuestionNames.Capabilities];
|
|
117
|
+
if (cap === constants_1.NotificationOptionItem().id) {
|
|
118
|
+
return undefined;
|
|
127
119
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
}
|
|
120
|
+
// Single Select Option for "Add Feature"
|
|
121
|
+
const feature = inputs[constants_1.AzureSolutionQuestionNames.Features];
|
|
122
|
+
if (feature === constants_1.NotificationOptionItem().id) {
|
|
123
|
+
return undefined;
|
|
133
124
|
}
|
|
134
125
|
return "Notification is not selected";
|
|
135
126
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"question.js","sourceRoot":"","sources":["../../../../src/component/feature/bot/question.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAA4F;
|
|
1
|
+
{"version":3,"file":"question.js","sourceRoot":"","sources":["../../../../src/component/feature/bot/question.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import { ContextV3, FxError, InputsWithProjectPath, ProjectSettingsV3, Result, Void } from "@microsoft/teamsfx-api";
|
|
2
2
|
import "reflect-metadata";
|
|
3
|
-
import "../connection/azureWebAppConfig";
|
|
4
|
-
import "../resource/azureSql";
|
|
5
|
-
import "../resource/identity";
|
|
6
3
|
export declare class SSO {
|
|
7
4
|
name: string;
|
|
8
5
|
add(context: ContextV3, inputs: InputsWithProjectPath): Promise<Result<any, FxError>>;
|
|
9
|
-
getScenario(inputs: InputsWithProjectPath): SsoScenario;
|
|
10
6
|
}
|
|
11
7
|
export interface updateComponents {
|
|
12
8
|
bot?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.d.ts","sourceRoot":"","sources":["../../../src/component/feature/sso.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAET,OAAO,EACP,qBAAqB,
|
|
1
|
+
{"version":3,"file":"sso.d.ts","sourceRoot":"","sources":["../../../src/component/feature/sso.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAET,OAAO,EACP,qBAAqB,EAErB,iBAAiB,EACjB,MAAM,EAEN,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,kBAAkB,CAAC;AAkB1B,qBACa,GAAG;IACd,IAAI,SAAS;IAEP,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;CAG5F;AA6BD,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AA+CD,wBAAgB,SAAS,CACvB,eAAe,EAAE,iBAAiB,EAClC,WAAW,UAAQ,GAClB,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAwCjC;AAED,oBAAY,WAAW;IACrB,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,MAAM,WAAW;CAClB"}
|