@microsoft/teamsfx-core 2.0.4-alpha.8b06251e7.0 → 2.0.4-alpha.8d68ea31a.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/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +16 -12
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/util/cpUtils.js +2 -2
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +3 -0
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -0
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/m365/launchHelper.d.ts +1 -1
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +12 -3
- 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 +14 -13
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -0
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples.d.ts +4 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +48 -21
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +3 -2
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
- package/build/common/spec-parser/constants.d.ts +4 -0
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +27 -0
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +10 -5
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +3 -1
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +3 -2
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +69 -31
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +4 -4
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +2 -2
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +32 -25
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +20 -0
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +170 -19
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/component/configManager/interface.d.ts +0 -1
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +1 -3
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +12 -47
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +16 -7
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +2 -1
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +1 -0
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/add/addWebPart.d.ts.map +1 -1
- package/build/component/driver/add/addWebPart.js +9 -0
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/arm/deploy.d.ts +0 -3
- package/build/component/driver/arm/deploy.d.ts.map +1 -1
- package/build/component/driver/arm/deploy.js +0 -6
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +3 -3
- 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/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +1 -1
- 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 +5 -14
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.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 +7 -2
- 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 +11 -8
- 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 +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +16 -0
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +23 -5
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +7 -7
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +1 -7
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +1 -1
- 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 +29 -22
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +5 -5
- 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 +23 -10
- 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 +0 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +1 -6
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts +0 -2
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +2 -6
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +0 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +4 -6
- package/build/component/driver/teamsApp/create.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 +11 -21
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +2 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +0 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +0 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +2 -7
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +2 -0
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +0 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +0 -5
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +0 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +0 -5
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +3 -3
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts +3 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +42 -16
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +22 -25
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +6 -0
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +13 -1
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +18 -10
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +2 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +8 -2
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +6 -2
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +2 -0
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +2 -2
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +3 -3
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/utils.d.ts +2 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +13 -13
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/messages.d.ts +2 -3
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +3 -4
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.d.ts +2 -2
- package/build/component/middleware/actionExecutionMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.d.ts.map +1 -1
- package/build/component/middleware/envMW.js +1 -1
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/provisionUtils.js +6 -6
- 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 +3 -1
- 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/utils/common.js +1 -1
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +8 -4
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +30 -15
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +5 -1
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +3 -0
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +2 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +2 -2
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +10 -12
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +9 -15
- package/build/question/generator.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +2 -2
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +10 -12
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +1 -1
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +2 -2
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +2 -2
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/options/PreviewTeamsAppOptions.js +2 -2
- package/build/question/options/PreviewTeamsAppOptions.js.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.d.ts.map +1 -1
- package/build/question/options/SPFxAddWebpartOptions.js +2 -3
- package/build/question/options/SPFxAddWebpartOptions.js.map +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js +1 -1
- package/build/question/options/SelectTeamsManifestOptions.js.map +1 -1
- package/build/question/options/ValidateTeamsAppOptions.js +2 -2
- package/build/question/options/ValidateTeamsAppOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +7 -5
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +1 -1
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/validationUtils.d.ts +17 -1
- package/build/ui/validationUtils.d.ts.map +1 -1
- package/build/ui/validationUtils.js +206 -4
- package/build/ui/validationUtils.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +16 -15
- package/build/ui/visitor.js.map +1 -1
- package/package.json +11 -8
- package/resource/package.nls.json +9 -8
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/build/common/samples-config-v3.json +0 -446
|
@@ -15,6 +15,7 @@ const templates_config_json_1 = tslib_1.__importDefault(require("../../common/te
|
|
|
15
15
|
const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
16
16
|
const error_1 = require("./error");
|
|
17
17
|
const tools_1 = require("../../common/tools");
|
|
18
|
+
const error_2 = require("../../core/error");
|
|
18
19
|
async function selectTemplateTag(getTags) {
|
|
19
20
|
const preRelease = process.env.TEAMSFX_TEMPLATE_PRERELEASE
|
|
20
21
|
? `0.0.0-${process.env.TEAMSFX_TEMPLATE_PRERELEASE}`
|
|
@@ -103,19 +104,17 @@ async function fetchZipFromUrl(url, tryLimits = constant_1.defaultTryLimits, tim
|
|
|
103
104
|
}
|
|
104
105
|
exports.fetchZipFromUrl = fetchZipFromUrl;
|
|
105
106
|
/* The unzip used for scaffold which would drop the attr of the files and dirs. */
|
|
106
|
-
async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn,
|
|
107
|
+
async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, filterFn) {
|
|
108
|
+
const output = [];
|
|
107
109
|
let entries = zip.getEntries().filter((entry) => !entry.isDirectory);
|
|
108
|
-
if (
|
|
109
|
-
entries = entries.filter((entry) => entry.entryName
|
|
110
|
+
if (filterFn) {
|
|
111
|
+
entries = entries.filter((entry) => filterFn(entry.entryName));
|
|
110
112
|
}
|
|
111
113
|
for (const entry of entries) {
|
|
112
114
|
const rawEntryData = entry.getData();
|
|
113
|
-
|
|
115
|
+
const entryName = nameReplaceFn
|
|
114
116
|
? nameReplaceFn(entry.entryName, rawEntryData)
|
|
115
117
|
: entry.entryName;
|
|
116
|
-
if (relativePath) {
|
|
117
|
-
entryName = entryName.replace(relativePath, "");
|
|
118
|
-
}
|
|
119
118
|
const entryData = dataReplaceFn
|
|
120
119
|
? dataReplaceFn(entry.name, rawEntryData)
|
|
121
120
|
: rawEntryData;
|
|
@@ -123,7 +122,9 @@ async function unzip(zip, dstPath, nameReplaceFn, dataReplaceFn, relativePath) {
|
|
|
123
122
|
const dirPath = path_1.default.dirname(filePath);
|
|
124
123
|
await fs.ensureDir(dirPath);
|
|
125
124
|
await fs.writeFile(filePath, entryData);
|
|
125
|
+
output.push(entryName);
|
|
126
126
|
}
|
|
127
|
+
return output;
|
|
127
128
|
}
|
|
128
129
|
exports.unzip = unzip;
|
|
129
130
|
function renderTemplateFileData(fileName, fileData, variables) {
|
|
@@ -164,7 +165,7 @@ exports.renderTemplateFileName = renderTemplateFileName;
|
|
|
164
165
|
function getSampleInfoFromName(sampleName) {
|
|
165
166
|
const sample = samples_1.sampleProvider.SampleCollection.samples.find((sample) => sample.id.toLowerCase() === sampleName.toLowerCase());
|
|
166
167
|
if (!sample) {
|
|
167
|
-
throw
|
|
168
|
+
throw error_2.InvalidInputError(`sample '${sampleName}' not found`);
|
|
168
169
|
}
|
|
169
170
|
return sample;
|
|
170
171
|
}
|
|
@@ -179,6 +180,7 @@ async function downloadDirectory(sampleUrl, dstPath, concurrencyLimits = constan
|
|
|
179
180
|
const urlInfo = parseSampleUrl(sampleUrl);
|
|
180
181
|
const { samplePaths, fileUrlPrefix } = await getSampleFileInfo(urlInfo, retryLimits);
|
|
181
182
|
await downloadSampleFiles(fileUrlPrefix, samplePaths, dstPath, urlInfo.dir, retryLimits, concurrencyLimits);
|
|
183
|
+
return samplePaths;
|
|
182
184
|
}
|
|
183
185
|
exports.downloadDirectory = downloadDirectory;
|
|
184
186
|
function parseSampleUrl(url) {
|
|
@@ -191,15 +193,13 @@ function parseSampleUrl(url) {
|
|
|
191
193
|
}
|
|
192
194
|
exports.parseSampleUrl = parseSampleUrl;
|
|
193
195
|
async function getSampleFileInfo(urlInfo, retryLimits) {
|
|
196
|
+
var _a;
|
|
194
197
|
const fileInfoUrl = `https://api.github.com/repos/${urlInfo.owner}/${urlInfo.repository}/git/trees/${urlInfo.ref}?recursive=1`;
|
|
195
198
|
const fileInfo = (await sendRequestWithRetry(async () => {
|
|
196
199
|
return await axios_1.default.get(fileInfoUrl);
|
|
197
200
|
}, retryLimits)).data;
|
|
198
|
-
const
|
|
199
|
-
const
|
|
200
|
-
.filter((node) => node.path.startsWith(`${urlInfo.dir}/`) && node.type !== "tree")
|
|
201
|
-
.map((node) => node.path);
|
|
202
|
-
const fileUrlPrefix = `https://raw.githubusercontent.com/${urlInfo.owner}/${urlInfo.repository}/${fileInfo.sha}/`;
|
|
201
|
+
const samplePaths = (_a = fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.tree) === null || _a === void 0 ? void 0 : _a.filter((node) => node.path.startsWith(`${urlInfo.dir}/`) && node.type !== "tree").map((node) => node.path);
|
|
202
|
+
const fileUrlPrefix = `https://raw.githubusercontent.com/${urlInfo.owner}/${urlInfo.repository}/${fileInfo === null || fileInfo === void 0 ? void 0 : fileInfo.sha}/`;
|
|
203
203
|
return { samplePaths, fileUrlPrefix };
|
|
204
204
|
}
|
|
205
205
|
async function downloadSampleFiles(fileUrlPrefix, samplePaths, dstPath, relativePath, retryLimits, concurrencyLimits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6DAAqD;AACrD,wDAAwB;AACxB,qDAA+B;AAC/B,yCAQoB;AACpB,kDAAoE;AACpE,8DAA6B;AAC7B,0DAA0D;AAC1D,uGAAgE;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/component/generator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
export declare class ProgressTitles {
|
|
2
|
-
static readonly
|
|
3
|
-
static readonly generateSample: string;
|
|
2
|
+
static readonly create: string;
|
|
4
3
|
}
|
|
5
4
|
export declare class ProgressMessages {
|
|
6
|
-
static readonly generateTemplate:
|
|
5
|
+
static readonly generateTemplate: string;
|
|
7
6
|
static readonly generateSample: (sampleName: string) => string;
|
|
8
7
|
static readonly configureAzureStorageEnableStaticWebsite: string;
|
|
9
8
|
static readonly runCommand: (command: string, directory: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":"AAKA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":"AAKA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,SAA8C;CACrE;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAA0D;IAC1F,MAAM,CAAC,QAAQ,CAAC,cAAc,eAAgB,MAAM,KAAG,MAAM,CACM;IACnE,MAAM,CAAC,QAAQ,CAAC,wCAAwC,SAEtD;IACF,MAAM,CAAC,QAAQ,CAAC,UAAU,YAAa,MAAM,aAAa,MAAM,KAAG,MAAM,CACJ;IACrE,MAAM,CAAC,QAAQ,CAAC,aAAa,aAAc,MAAM,QAAQ,MAAM,KAAG,MAAM,CACJ;CACrE;AAED,qBAAa,WAAW;IACtB,gBAAuB,oBAAoB,SAEzC;CACH"}
|
|
@@ -7,13 +7,12 @@ const localizeUtils_1 = require("../common/localizeUtils");
|
|
|
7
7
|
class ProgressTitles {
|
|
8
8
|
}
|
|
9
9
|
exports.ProgressTitles = ProgressTitles;
|
|
10
|
-
ProgressTitles.
|
|
11
|
-
ProgressTitles.generateSample = localizeUtils_1.getLocalizedString("core.progress.generateSample");
|
|
10
|
+
ProgressTitles.create = localizeUtils_1.getLocalizedString("core.progress.create");
|
|
12
11
|
class ProgressMessages {
|
|
13
12
|
}
|
|
14
13
|
exports.ProgressMessages = ProgressMessages;
|
|
15
|
-
ProgressMessages.generateTemplate =
|
|
16
|
-
ProgressMessages.generateSample = (sampleName) => localizeUtils_1.getLocalizedString("core.progress.
|
|
14
|
+
ProgressMessages.generateTemplate = localizeUtils_1.getLocalizedString("core.progress.createFromTemplate");
|
|
15
|
+
ProgressMessages.generateSample = (sampleName) => localizeUtils_1.getLocalizedString("core.progress.createFromSample", sampleName);
|
|
17
16
|
ProgressMessages.configureAzureStorageEnableStaticWebsite = localizeUtils_1.getLocalizedString("core.progress.configureAzureStorage");
|
|
18
17
|
ProgressMessages.runCommand = (command, directory) => localizeUtils_1.getLocalizedString("core.progress.runCommand", command, directory);
|
|
19
18
|
ProgressMessages.deployToAzure = (location, dist) => localizeUtils_1.getLocalizedString("core.progress.deployToAzure", location, dist);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2DAA6D;AAE7D,MAAa,cAAc;;AAA3B,
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/component/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,2DAA6D;AAE7D,MAAa,cAAc;;AAA3B,wCAEC;AADiB,qBAAM,GAAG,kCAAkB,CAAC,sBAAsB,CAAC,CAAC;AAGtE,MAAa,gBAAgB;;AAA7B,4CAWC;AAViB,iCAAgB,GAAG,kCAAkB,CAAC,kCAAkC,CAAC,CAAC;AAC1E,+BAAc,GAAG,CAAC,UAAkB,EAAU,EAAE,CAC9D,kCAAkB,CAAC,gCAAgC,EAAE,UAAU,CAAC,CAAC;AACnD,yDAAwC,GAAG,kCAAkB,CAC3E,qCAAqC,CACtC,CAAC;AACc,2BAAU,GAAG,CAAC,OAAe,EAAE,SAAiB,EAAU,EAAE,CAC1E,kCAAkB,CAAC,0BAA0B,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AACrD,8BAAa,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAU,EAAE,CACzE,kCAAkB,CAAC,6BAA6B,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAGtE,MAAa,WAAW;;AAAxB,kCAIC;AAHwB,gCAAoB,GAAG,kCAAkB,CAC9D,uCAAuC,CACxC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Middleware } from "@feathersjs/hooks/lib";
|
|
2
|
-
import { Context, FxError, IProgressHandler, InputsWithProjectPath, MaybePromise,
|
|
2
|
+
import { Context, FxError, IProgressHandler, InputsWithProjectPath, MaybePromise, IQTreeNode, Result } from "@microsoft/teamsfx-api";
|
|
3
3
|
interface ActionOption {
|
|
4
4
|
componentName?: string;
|
|
5
5
|
errorSource?: string;
|
|
@@ -12,7 +12,7 @@ interface ActionOption {
|
|
|
12
12
|
enableProgressBar?: boolean;
|
|
13
13
|
progressTitle?: string;
|
|
14
14
|
progressSteps?: number;
|
|
15
|
-
question?: (context: Context, inputs: InputsWithProjectPath) => MaybePromise<Result<
|
|
15
|
+
question?: (context: Context, inputs: InputsWithProjectPath) => MaybePromise<Result<IQTreeNode | undefined, FxError>>;
|
|
16
16
|
}
|
|
17
17
|
export interface ActionContext {
|
|
18
18
|
progressBar?: IProgressHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actionExecutionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"actionExecutionMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/actionExecutionMW.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EACL,OAAO,EACP,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,YAAY,EACZ,UAAU,EACV,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAUhC,UAAU,YAAY;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,CACT,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,qBAAqB,KAC1B,YAAY,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;CAC5D;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AACD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAwFlE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAY7D;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,oBAAoB,UAAQ,GAAG,UAAU,CAiB3F;
|
|
1
|
+
{"version":3,"file":"envMW.d.ts","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAY7D;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,oBAAoB,UAAQ,GAAG,UAAU,CAiB3F;AAuCD,eAAO,MAAM,WAAW,EAAE,UAazB,CAAC"}
|
|
@@ -56,7 +56,7 @@ const envLoaderMWImpl = async (withLocalEnv, ctx, next, skipLoadIfNoEnvInput = f
|
|
|
56
56
|
const question = other_1.selectTargetEnvQuestion(questionNames_1.QuestionNames.Env, !withLocalEnv, true);
|
|
57
57
|
const res = await visitor_1.traverse({ data: question }, inputs, globalVars_1.TOOLS.ui);
|
|
58
58
|
if (res.isErr()) {
|
|
59
|
-
|
|
59
|
+
globalVars_1.TOOLS.logProvider.debug(`Failed to run question model for target environment.`);
|
|
60
60
|
ctx.result = teamsfx_api_1.err(res.error);
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":";;;;AAGA,wDAAqD;AACrD,4DAAuB;AACvB,wDAA4D;AAC5D,4CAAwD;AACxD,sDAA8C;AAE9C,gEAA6D;AAC7D,gDAA+D;AAC/D,8CAA4C;AAC5C,8CAA2C;AAE3C;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,YAAqB,EAAE,oBAAoB,GAAG,KAAK;IAC7E,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,gBAAC,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI;YACF,MAAM,eAAe,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;YACrE,OAAO;SACR;gBAAS;YACR,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;gBACpB,IAAI,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE;oBACrB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACvB;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC/B;aACF;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAjBD,kCAiBC;AAED,MAAM,eAAe,GAAG,KAAK,EAC3B,YAAqB,EACrB,GAAoB,EACpB,IAAkB,EAClB,oBAAoB,GAAG,KAAK,EAC5B,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IACvC,IAAI,CAAC,WAAW,EAAE;QAChB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,4BAAoB,EAAE,CAAC,CAAC;QAC7C,OAAO;KACR;IACD,IAAI,MAAM,CAAC,aAAa,EAAE;QACxB,MAAM,CAAC,GAAG,GAAG,gCAAkB,CAAC,iBAAiB,EAAE,CAAC;KACrD;IACD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QACf,IAAI,oBAAoB,EAAE;YACxB,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;SACR;QACD,MAAM,QAAQ,GAAG,+BAAuB,CAAC,6BAAa,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACjF,MAAM,GAAG,GAAG,MAAM,kBAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,CAAC,CAAC;QACjE,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,
|
|
1
|
+
{"version":3,"file":"envMW.js","sourceRoot":"","sources":["../../../src/component/middleware/envMW.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,11 +22,11 @@ class ProvisionUtils {
|
|
|
22
22
|
* subscriptionId is provided from .env.xxx file
|
|
23
23
|
*/
|
|
24
24
|
async ensureSubscription(azureAccountProvider, givenSubscriptionId) {
|
|
25
|
-
|
|
25
|
+
globalVars_1.TOOLS.logProvider.info("check whether azure account is signed in.");
|
|
26
26
|
// make sure the user is logged in
|
|
27
27
|
await azureAccountProvider.getIdentityCredentialAsync(true);
|
|
28
28
|
if (!givenSubscriptionId) {
|
|
29
|
-
|
|
29
|
+
globalVars_1.TOOLS.logProvider.info("subscription is not selected, try to select.");
|
|
30
30
|
try {
|
|
31
31
|
const subscriptionInAccount = await azureAccountProvider.getSelectedSubscription(true);
|
|
32
32
|
if (!subscriptionInAccount) {
|
|
@@ -34,7 +34,7 @@ class ProvisionUtils {
|
|
|
34
34
|
return teamsfx_api_1.err(new azure_1.SelectSubscriptionError());
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
|
|
37
|
+
globalVars_1.TOOLS.logProvider.info(`successful to select subscription: ${subscriptionInAccount.subscriptionId}`);
|
|
38
38
|
return teamsfx_api_1.ok(subscriptionInAccount);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -43,14 +43,14 @@ class ProvisionUtils {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
// verify valid subscription (permission)
|
|
46
|
-
|
|
46
|
+
globalVars_1.TOOLS.logProvider.info("subscription is given, try to validate");
|
|
47
47
|
const subscriptions = await azureAccountProvider.listSubscriptions();
|
|
48
48
|
const foundSubscriptionInfo = findSubscriptionFromList(givenSubscriptionId, subscriptions);
|
|
49
49
|
if (!foundSubscriptionInfo) {
|
|
50
|
-
|
|
50
|
+
globalVars_1.TOOLS.logProvider.info("subscription validate fail");
|
|
51
51
|
return teamsfx_api_1.err(new azure_1.InvalidAzureSubscriptionError(givenSubscriptionId));
|
|
52
52
|
}
|
|
53
|
-
|
|
53
|
+
globalVars_1.TOOLS.logProvider.info("subscription validate success");
|
|
54
54
|
return teamsfx_api_1.ok(foundSubscriptionInfo);
|
|
55
55
|
}
|
|
56
56
|
async ensureResourceGroup(inputs, azureAccountProvider, subscriptionId, givenResourceGroupName, defaultResourceGroupName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAgE;AAChE,wDAUgC;AAChC,mDAAgD;AAChD,2DAA6D;AAC7D,mDAAwE;AACxE,2CAA+C;AAC/C,mDAA2C;AAC3C,0CAKwB;AACxB,4CAAgD;AAChD,wCAIuB;AACvB,2CAAwD;AAExD,2DAA8D;AAC9D,qEAAqF;AAMrF,MAAM,cAAc;IAClB;;;OAGG;IACH,KAAK,CAAC,kBAAkB,CACtB,oBAA0C,EAC1C,mBAA4B;QAE5B,
|
|
1
|
+
{"version":3,"file":"provisionUtils.js","sourceRoot":"","sources":["../../src/component/provisionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAkB,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAoB,MAAM,OAAO,CAAC;AAoCxD,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,OAAO,CAA0B;WAElC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa;IAqBlE;;;OAGG;WACW,SAAS,CAAC,MAAM,EAAE,MAAM;WAIlB,kBAAkB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;WAqBpB,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,gBAAgB,EAC9B,cAAc,UAAO,EACrB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;WA4BI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WAgBI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAkB,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjF,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAoB,MAAM,OAAO,CAAC;AAoCxD,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAC,OAAO,CAA0B;WAElC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa;IAqBlE;;;OAGG;WACW,SAAS,CAAC,MAAM,EAAE,MAAM;WAIlB,kBAAkB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;WAqBpB,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,gBAAgB,EAC9B,cAAc,UAAO,EACrB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;WA4BI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WAgBI,qBAAqB,CACvC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}
|
|
@@ -126,7 +126,9 @@ class AppStudioClient {
|
|
|
126
126
|
appStudioClient_1.AppStudioClient.sendStartEvent(constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT);
|
|
127
127
|
const axiosInstance = AppStudioClient.newAxiosInstance(token);
|
|
128
128
|
try {
|
|
129
|
-
const response = await retryHandler_1.RetryHandler.Retry(() =>
|
|
129
|
+
const response = await retryHandler_1.RetryHandler.Retry(() =>
|
|
130
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
131
|
+
axiosInstance.post(`${AppStudioClient.baseUrl}/api/botframework/${botReg.botId}`, botReg));
|
|
130
132
|
if (!common_1.isHappyResponse(response)) {
|
|
131
133
|
throw new errors_1.ConfigUpdatingError(strings_1.ConfigNames.MESSAGE_ENDPOINT);
|
|
132
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"appStudioClient.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/appStudio/appStudioClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
* @author Qianhao Dong <qidon@microsoft.com>
|
|
3
3
|
*/
|
|
4
4
|
import { IBotRegistration } from "../appStudio/interfaces/IBotRegistration";
|
|
5
|
-
import { FxError, Result, M365TokenProvider } from "@microsoft/teamsfx-api";
|
|
6
|
-
export declare function createOrUpdateBotRegistration(m365TokenProvider: M365TokenProvider, botRegistration: IBotRegistration): Promise<Result<boolean, FxError>>;
|
|
5
|
+
import { FxError, Result, M365TokenProvider, LogProvider } from "@microsoft/teamsfx-api";
|
|
6
|
+
export declare function createOrUpdateBotRegistration(m365TokenProvider: M365TokenProvider, botRegistration: IBotRegistration, logger?: LogProvider): Promise<Result<boolean, FxError>>;
|
|
7
7
|
//# sourceMappingURL=botFrameworkRegistration.d.ts.map
|
package/build/component/resource/botService/botRegistration/botFrameworkRegistration.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAO,OAAO,EAAE,MAAM,EAAM,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAO,OAAO,EAAE,MAAM,EAAM,iBAAiB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKlG,wBAAsB,6BAA6B,CACjD,iBAAiB,EAAE,iBAAiB,EACpC,eAAe,EAAE,gBAAgB,EACjC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAkCnC"}
|
|
@@ -7,7 +7,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
7
7
|
const tools_1 = require("../../../../common/tools");
|
|
8
8
|
const appStudioClient_1 = require("../appStudio/appStudioClient");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
|
-
async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration) {
|
|
10
|
+
async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration, logger) {
|
|
11
11
|
// 1. Get bot registration from remote.
|
|
12
12
|
// 2. If Not Found, Then create a new bot registration.
|
|
13
13
|
// 3. Else:
|
|
@@ -20,14 +20,19 @@ async function createOrUpdateBotRegistration(m365TokenProvider, botRegistration)
|
|
|
20
20
|
return teamsfx_api_1.err(appStudioTokenRes.error);
|
|
21
21
|
}
|
|
22
22
|
const appStudioToken = appStudioTokenRes.value;
|
|
23
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Input bot registration: ${JSON.stringify(botRegistration)}`);
|
|
23
24
|
const remoteBotRegistration = await appStudioClient_1.AppStudioClient.getBotRegistration(appStudioToken, botRegistration.botId);
|
|
24
25
|
if (!remoteBotRegistration) {
|
|
25
26
|
// Not Found case.
|
|
27
|
+
logger === null || logger === void 0 ? void 0 : logger.verbose("Bot registration not found, create a new one.");
|
|
26
28
|
await appStudioClient_1.AppStudioClient.createBotRegistration(appStudioToken, botRegistration, false);
|
|
27
29
|
}
|
|
28
30
|
else {
|
|
29
31
|
// Update bot registration.
|
|
32
|
+
logger === null || logger === void 0 ? void 0 : logger.verbose("Bot registration found, update it.");
|
|
33
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Existing bot registration: ${JSON.stringify(remoteBotRegistration)}`);
|
|
30
34
|
const mergedBotRegistration = utils_1.Utils.mergeIBotRegistration(botRegistration, remoteBotRegistration);
|
|
35
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Merged bot registration: ${JSON.stringify(mergedBotRegistration)}`);
|
|
31
36
|
await appStudioClient_1.AppStudioClient.updateBotRegistration(appStudioToken, mergedBotRegistration);
|
|
32
37
|
}
|
|
33
38
|
return teamsfx_api_1.ok(remoteBotRegistration !== undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,
|
|
1
|
+
{"version":3,"file":"botFrameworkRegistration.js","sourceRoot":"","sources":["../../../../../src/component/resource/botService/botRegistration/botFrameworkRegistration.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,wDAAkG;AAClG,oDAA2D;AAC3D,kEAA+D;AAC/D,mCAAgC;AAEzB,KAAK,UAAU,6BAA6B,CACjD,iBAAoC,EACpC,eAAiC,EACjC,MAAoB;IAEpB,uCAAuC;IACvC,uDAAuD;IACvD,WAAW;IACX,2EAA2E;IAC3E,oCAAoC;IACpC,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC/D,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACrC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;IAC/C,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,2BAA2B,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC5E,MAAM,qBAAqB,GAAG,MAAM,iCAAe,CAAC,kBAAkB,CACpE,cAAc,EACd,eAAe,CAAC,KAAM,CACvB,CAAC;IACF,IAAI,CAAC,qBAAqB,EAAE;QAC1B,kBAAkB;QAClB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,+CAA+C,CAAC,CAAC;QACjE,MAAM,iCAAe,CAAC,qBAAqB,CAAC,cAAc,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;KACrF;SAAM;QACL,2BAA2B;QAC3B,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,oCAAoC,CAAC,CAAC;QACtD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,qBAAqB,GAAG,aAAK,CAAC,qBAAqB,CACvD,eAAe,EACf,qBAAqB,CACtB,CAAC;QACF,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACnF,MAAM,iCAAe,CAAC,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;KACpF;IACD,OAAO,gBAAE,CAAC,qBAAqB,KAAK,SAAS,CAAC,CAAC;AACjD,CAAC;AAtCD,sEAsCC"}
|
|
@@ -70,7 +70,7 @@ async function wrapRun(exec, errorSource, errorHandler, logProvider) {
|
|
|
70
70
|
}
|
|
71
71
|
if (error instanceof componentError_1.BaseComponentInnerError) {
|
|
72
72
|
if (error.detail) {
|
|
73
|
-
|
|
73
|
+
logProvider === null || logProvider === void 0 ? void 0 : logProvider.debug(`Error occurred: ${error.detail}`);
|
|
74
74
|
}
|
|
75
75
|
return teamsfx_api_1.err(error.toFxError());
|
|
76
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,4DAAqF;AACrF,wDAQgC;AAChC,wDAAwB;AAExB,8DAAgE;AAEhE,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;AAE7D;;;;GAIG;AACH,SAAgB,gBAAgB,CAAI,IAAY,EAAE,KAA2B;IAC3E,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KAC1D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,4CAKC;AAED,SAAgB,UAAU,CAAI,EAAqD;IACjF,OAAO,UAAU,CAAU,EAAE,GAAW,EAAE,QAAiB;QACzD,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,EAAE;YACjC,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAPD,gCAOC;AAED,SAAgB,SAAS,CAAC,CAAU,EAAE,GAAW,EAAE,QAAiB;IAClE,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;QAC1B,OAAO,CAAC,CAAC;KACV;SAAM,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QAChC,OAAO,CAAC,KAAK,MAAM,CAAC;KACrB;IACD,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAPD,8BAOC;AAED,SAAgB,QAAQ,CAAC,CAAU,EAAE,GAAW,EAAE,QAAiB;IACjE,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;QACzB,OAAO,CAAC,CAAC;KACV;IACD,MAAM,kCAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AALD,4BAKC;AAMD,SAAgB,SAAS,CAAI,aAA+B;IAC1D,OAAO,UAAU,IAAa,EAAE,QAAiB;QAC/C,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;YAC7C,MAAM,MAAM,GAAG,IAAoB,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAmB,EAAE;gBAC9D,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;aAC7D;YACD,OAAO,MAAM,CAAC;SACf;QACD,MAAM,kCAAiB,CAAC,gBAAgB,CACtC,QAAQ,EACR,MAAM,EACN,yBAAyB,EACzB,SAAS,EACT,QAAQ,CACT,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,8BAiBC;AAEM,KAAK,UAAU,OAAO,CAC3B,IAAwC,EACxC,WAAmB,EACnB,YAAkC,EAClC,WAAyB;IAEzB,IAAI;QACF,OAAO,gBAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;KACzB;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,YAAY,EAAE;YAChB,MAAM,YAAY,EAAE,CAAC;SACtB;QACD,IAAI,KAAK,YAAY,wCAAuB,EAAE;YAC5C,IAAI,KAAK,CAAC,MAAM,EAAE;gBAChB,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpUtils.d.ts","sourceRoot":"","sources":["../../../../src/component/utils/depsChecker/cpUtils.ts"],"names":[],"mappings":";AAYA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,yBAAiB,OAAO,CAAC;IACvB,SAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,iBAAiB,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EAC9C,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"cpUtils.d.ts","sourceRoot":"","sources":["../../../../src/component/utils/depsChecker/cpUtils.ts"],"names":[],"mappings":";AAYA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,yBAAiB,OAAO,CAAC;IACvB,SAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,iBAAiB,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EAC9C,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,cAAc,CAAC,CA0EzB;IAED,UAAiB,cAAc;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,MAAM,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB;CACF"}
|
|
@@ -20,11 +20,11 @@ var cpUtils;
|
|
|
20
20
|
if (result.code !== 0) {
|
|
21
21
|
const errorMessage = `Failed to run command: "${command} ${result.formattedArgs}", code: "${result.code}",
|
|
22
22
|
output: "${result.cmdOutput}", error: "${result.cmdOutputIncludingStderr}"`;
|
|
23
|
-
|
|
23
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(errorMessage);
|
|
24
24
|
throw new Error(errorMessage);
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
|
-
|
|
27
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Finished running command: "${command} ${result.formattedArgs}".`);
|
|
28
28
|
}
|
|
29
29
|
return result.cmdOutput;
|
|
30
30
|
}
|
|
@@ -48,7 +48,9 @@ var cpUtils;
|
|
|
48
48
|
timer = setTimeout(() => {
|
|
49
49
|
childProc.kill();
|
|
50
50
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Stop exec due to timeout, command: "${command} ${formattedArgs}", options = '${JSON.stringify(options)}'`);
|
|
51
|
-
reject(new Error(
|
|
51
|
+
reject(new Error(
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
53
|
+
`Exec command: "${command} ${formattedArgs}" timeout, ${options.timeout} ms`));
|
|
52
54
|
}, options.timeout);
|
|
53
55
|
}
|
|
54
56
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Running command: "${command} ${formattedArgs}", options = '${JSON.stringify(options)}'`);
|
|
@@ -62,7 +64,9 @@ var cpUtils;
|
|
|
62
64
|
cmdOutputIncludingStderr = cmdOutputIncludingStderr.concat(data);
|
|
63
65
|
});
|
|
64
66
|
childProc.on("error", (error) => {
|
|
65
|
-
logger === null || logger === void 0 ? void 0 : logger.debug(
|
|
67
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(
|
|
68
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
69
|
+
`Failed to run command '${command} ${formattedArgs}': cmdOutputIncludingStderr: '${cmdOutputIncludingStderr}', error: ${error}`);
|
|
66
70
|
if (timer) {
|
|
67
71
|
clearTimeout(timer);
|
|
68
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpUtils.js","sourceRoot":"","sources":["../../../../src/component/utils/depsChecker/cpUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,oDAAoD;AAEpD,QAAQ;AACR,4CAA4C;AAC5C,0FAA0F;AAC1F,oEAAoE;AACpE,+GAA+G;AAC/G,0CAA0C;AAE1C,0DAAoC;AACpC,+CAAyB;AAGzB,IAAiB,OAAO,
|
|
1
|
+
{"version":3,"file":"cpUtils.js","sourceRoot":"","sources":["../../../../src/component/utils/depsChecker/cpUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -182,10 +182,10 @@ class EnvUtil {
|
|
|
182
182
|
await fs_extra_1.default.writeFile(dotEnvSecretFilePath, contentSecret, { encoding: "utf8" });
|
|
183
183
|
}
|
|
184
184
|
if (!envFileExists) {
|
|
185
|
-
|
|
185
|
+
globalVars_1.TOOLS.logProvider.info(" Created environment file at " + dotEnvFilePath + os_1.EOL + os_1.EOL);
|
|
186
186
|
}
|
|
187
187
|
if (!envSecretFileExists && Object.keys(parsedDotenvSecret.obj).length > 0) {
|
|
188
|
-
|
|
188
|
+
globalVars_1.TOOLS.logProvider.info(" Created environment file (secret) at " + dotEnvSecretFilePath + os_1.EOL + os_1.EOL);
|
|
189
189
|
}
|
|
190
190
|
return teamsfx_api_1.ok(undefined);
|
|
191
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
package/build/core/FxCore.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ApiOperation, CoreCallbackEvent, CreateProjectResult, CryptoProvider, Func, FxError, Inputs, InputsWithProjectPath,
|
|
1
|
+
import { ApiOperation, CoreCallbackEvent, CreateProjectResult, CryptoProvider, Func, FxError, Inputs, InputsWithProjectPath, IQTreeNode, OpenAIPluginManifest, Result, Stage, Tools } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DotenvParseOutput } from "dotenv";
|
|
3
3
|
import "reflect-metadata";
|
|
4
4
|
import { ListCollaboratorResult, PermissionsResult } from "../common/permissionInterface";
|
|
@@ -9,6 +9,7 @@ import "../component/driver/script/scriptDriver";
|
|
|
9
9
|
import { ErrorResult } from "../component/generator/copilotPlugin/helper";
|
|
10
10
|
import { ValidateTeamsAppInputs } from "../question";
|
|
11
11
|
import { CoreHookContext, PreProvisionResForVS, VersionCheckRes } from "./types";
|
|
12
|
+
import "../component/feature/sso";
|
|
12
13
|
export declare type CoreCallbackFunc = (name: string, err?: FxError, data?: any) => void | Promise<void>;
|
|
13
14
|
export declare class FxCore {
|
|
14
15
|
constructor(tools: Tools);
|
|
@@ -81,7 +82,7 @@ export declare class FxCore {
|
|
|
81
82
|
/**
|
|
82
83
|
* Warning: this API only works for CLI_HELP, it has no business with interactive run for CLI!
|
|
83
84
|
*/
|
|
84
|
-
getQuestions(stage: Stage, inputs: Inputs): Result<
|
|
85
|
+
getQuestions(stage: Stage, inputs: Inputs): Result<IQTreeNode | undefined, FxError>;
|
|
85
86
|
/**
|
|
86
87
|
* get all dot envs
|
|
87
88
|
*/
|