@microsoft/teamsfx-core 3.0.11 → 3.1.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/client/aadAppClient.d.ts.map +1 -1
- package/build/client/aadAppClient.js +16 -20
- package/build/client/aadAppClient.js.map +1 -1
- package/build/client/graphClient.d.ts +0 -2
- package/build/client/graphClient.d.ts.map +1 -1
- package/build/client/graphClient.js +15 -15
- package/build/client/graphClient.js.map +1 -1
- package/build/client/interfaces/GetJoinedTeamsResponse.d.ts +1 -1
- package/build/client/interfaces/GetJoinedTeamsResponse.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.d.ts +0 -2
- package/build/client/teamsDevPortalClient.d.ts.map +1 -1
- package/build/client/teamsDevPortalClient.js +50 -72
- package/build/client/teamsDevPortalClient.js.map +1 -1
- package/build/common/accountUtils.js +6 -6
- package/build/common/accountUtils.js.map +1 -1
- package/build/common/authInterface.d.ts +1 -1
- package/build/common/authInterface.d.ts.map +1 -1
- package/build/common/azureUtils.js +1 -2
- package/build/common/azureUtils.js.map +1 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +23 -23
- package/build/common/constants.js.map +1 -1
- package/build/common/correlator.js +1 -1
- package/build/common/correlator.js.map +1 -1
- package/build/common/daSpecParser.js +33 -28
- package/build/common/daSpecParser.js.map +1 -1
- package/build/common/featureFlags.d.ts +0 -5
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +90 -95
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/fetchHelper.d.ts +3 -0
- package/build/common/fetchHelper.d.ts.map +1 -0
- package/build/common/fetchHelper.js +19 -0
- package/build/common/fetchHelper.js.map +1 -0
- package/build/common/globalState.js +2 -3
- package/build/common/globalState.js.map +1 -1
- package/build/common/globalVars.d.ts +1 -1
- package/build/common/globalVars.d.ts.map +1 -1
- package/build/common/globalVars.js +18 -17
- package/build/common/globalVars.js.map +1 -1
- package/build/common/jsonUtils.js +2 -4
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/kiotaClient.js +7 -8
- package/build/common/kiotaClient.js.map +1 -1
- package/build/common/localizeUtils.d.ts +5 -0
- package/build/common/localizeUtils.d.ts.map +1 -1
- package/build/common/localizeUtils.js +11 -4
- package/build/common/localizeUtils.js.map +1 -1
- package/build/common/permissionInterface.js +1 -1
- package/build/common/permissionInterface.js.map +1 -1
- package/build/common/projectSettingsHelper.js +18 -19
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/projectTypeChecker.js +12 -15
- package/build/common/projectTypeChecker.js.map +1 -1
- package/build/common/requestUtils.js +4 -6
- package/build/common/requestUtils.js.map +1 -1
- package/build/common/samples.d.ts +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +13 -7
- package/build/common/samples.js.map +1 -1
- package/build/common/secretmasker/dict.js +6 -4
- package/build/common/secretmasker/dict.js.map +1 -1
- package/build/common/secretmasker/feature.d.ts +1 -1
- package/build/common/secretmasker/feature.d.ts.map +1 -1
- package/build/common/secretmasker/feature.js +10 -10
- package/build/common/secretmasker/feature.js.map +1 -1
- package/build/common/secretmasker/masker.js +8 -10
- package/build/common/secretmasker/masker.js.map +1 -1
- package/build/common/stringUtils.js +12 -13
- package/build/common/stringUtils.js.map +1 -1
- package/build/common/telemetry.js +19 -22
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +4 -3
- package/build/common/tools.js +13 -15
- package/build/common/tools.js.map +1 -1
- package/build/common/utils.js +3 -4
- package/build/common/utils.js.map +1 -1
- package/build/common/versionMetadata.d.ts +2 -2
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +6 -6
- package/build/common/versionMetadata.js.map +1 -1
- package/build/common/wrappedAxiosClient.d.ts.map +1 -1
- package/build/common/wrappedAxiosClient.js +38 -21
- package/build/common/wrappedAxiosClient.js.map +1 -1
- package/build/component/configManager/actionInjector.js +23 -16
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/configManager/constant.js +2 -2
- package/build/component/configManager/constant.js.map +1 -1
- package/build/component/configManager/interface.d.ts +15 -15
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +9 -8
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/configManager/validator.d.ts +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +2 -1
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/constant/commonConstant.js +13 -13
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/constant/deployConstant.js +36 -36
- package/build/component/constant/deployConstant.js.map +1 -1
- package/build/component/constants.js +35 -35
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.js +36 -47
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts +2 -2
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +3 -0
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/deployUtils.js +2 -3
- package/build/component/deployUtils.js.map +1 -1
- package/build/component/deps-checker/checkerFactory.js.map +1 -1
- package/build/component/deps-checker/constant/telemetry.js +4 -4
- package/build/component/deps-checker/constant/telemetry.js.map +1 -1
- package/build/component/deps-checker/coreDepsLoggerAdapter.js +2 -1
- package/build/component/deps-checker/coreDepsLoggerAdapter.js.map +1 -1
- package/build/component/deps-checker/coreDepsTelemetryAdapter.js +10 -3
- package/build/component/deps-checker/coreDepsTelemetryAdapter.js.map +1 -1
- package/build/component/deps-checker/depsChecker.d.ts +2 -2
- package/build/component/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/component/deps-checker/depsChecker.js +2 -2
- package/build/component/deps-checker/depsChecker.js.map +1 -1
- package/build/component/deps-checker/depsManager.d.ts +1 -1
- package/build/component/deps-checker/depsManager.d.ts.map +1 -1
- package/build/component/deps-checker/depsManager.js +8 -5
- package/build/component/deps-checker/depsManager.js.map +1 -1
- package/build/component/deps-checker/internal/dotnetChecker.js +7 -6
- package/build/component/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/component/deps-checker/internal/funcToolChecker.d.ts +1 -1
- package/build/component/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/component/deps-checker/internal/funcToolChecker.js +12 -14
- package/build/component/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/component/deps-checker/internal/nodeChecker.js +18 -22
- package/build/component/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/component/deps-checker/internal/testToolChecker.d.ts +1 -1
- package/build/component/deps-checker/internal/testToolChecker.d.ts.map +1 -1
- package/build/component/deps-checker/internal/testToolChecker.js +78 -71
- package/build/component/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/component/deps-checker/internal/vxTestAppChecker.js +3 -1
- package/build/component/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/component/deps-checker/util/cpUtils.d.ts +0 -1
- package/build/component/deps-checker/util/cpUtils.d.ts.map +1 -1
- package/build/component/deps-checker/util/cpUtils.js +9 -10
- package/build/component/deps-checker/util/cpUtils.js.map +1 -1
- package/build/component/deps-checker/util/downloadHelper.js +2 -3
- package/build/component/deps-checker/util/downloadHelper.js.map +1 -1
- package/build/component/deps-checker/util/fileHelper.js +5 -6
- package/build/component/deps-checker/util/fileHelper.js.map +1 -1
- package/build/component/deps-checker/util/progressIndicator.js +1 -2
- package/build/component/deps-checker/util/progressIndicator.js.map +1 -1
- package/build/component/deps-checker/util/system.js +4 -5
- package/build/component/deps-checker/util/system.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +4 -5
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.js +18 -21
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +9 -9
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/error/invalidFieldInManifestError.js.map +1 -1
- package/build/component/driver/aad/error/missingEnvError.js.map +1 -1
- package/build/component/driver/aad/interface/createAadAppOutput.d.ts +1 -1
- package/build/component/driver/aad/interface/createAadAppOutput.d.ts.map +1 -1
- package/build/component/driver/aad/interface/signInAudience.js +1 -1
- package/build/component/driver/aad/interface/signInAudience.js.map +1 -1
- package/build/component/driver/aad/permissions/index.js +3 -3
- package/build/component/driver/aad/permissions/index.js.map +1 -1
- package/build/component/driver/aad/update.js +12 -15
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +26 -25
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/buildAadManifest.js +3 -6
- package/build/component/driver/aad/utility/buildAadManifest.js.map +1 -1
- package/build/component/driver/aad/utility/constants.js +1 -1
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/add/addWebPart.js +6 -9
- package/build/component/driver/add/addWebPart.js.map +1 -1
- package/build/component/driver/add/utility/constants.js +5 -5
- package/build/component/driver/add/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/create.js +10 -13
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyOutputs.d.ts +1 -1
- package/build/component/driver/apiKey/interface/createApiKeyOutputs.d.ts.map +1 -1
- package/build/component/driver/apiKey/update.js +9 -12
- package/build/component/driver/apiKey/update.js.map +1 -1
- package/build/component/driver/apiKey/utility/utility.js +4 -5
- package/build/component/driver/apiKey/utility/utility.js.map +1 -1
- package/build/component/driver/arm/constant.js +1 -1
- package/build/component/driver/arm/constant.js.map +1 -1
- package/build/component/driver/arm/deploy.js +4 -6
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.js +7 -4
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/interface.d.ts +1 -1
- package/build/component/driver/arm/interface.d.ts.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +18 -19
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.d.ts +1 -1
- package/build/component/driver/arm/util/handleError.d.ts.map +1 -1
- package/build/component/driver/arm/util/handleError.js +13 -16
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/arm/util/innerHandleError.js +6 -19
- package/build/component/driver/arm/util/innerHandleError.js.map +1 -1
- package/build/component/driver/arm/util/util.js +3 -4
- package/build/component/driver/arm/util/util.js.map +1 -1
- package/build/component/driver/arm/validator.js +1 -2
- package/build/component/driver/arm/validator.js.map +1 -1
- package/build/component/driver/botAadApp/create.js +14 -17
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botAadApp/interface/createBotAadAppOutput.d.ts +1 -1
- package/build/component/driver/botAadApp/interface/createBotAadAppOutput.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +9 -12
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +8 -9
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js +9 -10
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +13 -15
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +15 -33
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +19 -22
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +0 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +30 -31
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +13 -18
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +22 -15
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +12 -15
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/constants.js +12 -12
- package/build/component/driver/deploy/spfx/utility/constants.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/sleep.js +1 -2
- package/build/component/driver/deploy/spfx/utility/sleep.js.map +1 -1
- package/build/component/driver/deploy/spfx/utility/spoClient.d.ts +0 -2
- package/build/component/driver/deploy/spfx/utility/spoClient.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/utility/spoClient.js +2 -2
- package/build/component/driver/deploy/spfx/utility/spoClient.js.map +1 -1
- package/build/component/driver/devChannel/create.js +4 -6
- package/build/component/driver/devChannel/create.js.map +1 -1
- package/build/component/driver/devChannel/installApp.d.ts.map +1 -1
- package/build/component/driver/devChannel/installApp.js +7 -10
- package/build/component/driver/devChannel/installApp.js.map +1 -1
- package/build/component/driver/devChannel/interfaces/CreateDevChannelOutput.d.ts +1 -1
- package/build/component/driver/devChannel/interfaces/CreateDevChannelOutput.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +6 -6
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/httpClient.d.ts +2 -3
- package/build/component/driver/devTool/httpClient.d.ts.map +1 -1
- package/build/component/driver/devTool/httpClient.js +36 -33
- package/build/component/driver/devTool/httpClient.js.map +1 -1
- package/build/component/driver/devTool/installDriver.js +26 -32
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/nodeInstaller.d.ts +0 -2
- package/build/component/driver/devTool/nodeInstaller.d.ts.map +1 -1
- package/build/component/driver/devTool/nodeInstaller.js +33 -34
- package/build/component/driver/devTool/nodeInstaller.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +13 -17
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +7 -10
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/interface/buildAndDeployArgs.d.ts +10 -10
- package/build/component/driver/interface/buildAndDeployArgs.d.ts.map +1 -1
- package/build/component/driver/interface/commonArgs.d.ts +1 -1
- package/build/component/driver/interface/commonArgs.d.ts.map +1 -1
- package/build/component/driver/interface/provisionArgs.d.ts +2 -2
- package/build/component/driver/interface/provisionArgs.d.ts.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +1 -1
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +8 -11
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.js +6 -7
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +5 -6
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/oauth/create.js +12 -16
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/interface/createOauthOutputs.d.ts +1 -1
- package/build/component/driver/oauth/interface/createOauthOutputs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +12 -17
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/utility.d.ts.map +1 -1
- package/build/component/driver/oauth/utility/utility.js +7 -16
- package/build/component/driver/oauth/utility/utility.js.map +1 -1
- package/build/component/driver/script/baseBuildDriver.d.ts +1 -1
- package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +15 -11
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/dotnetBuildDriver.js +4 -10
- package/build/component/driver/script/dotnetBuildDriver.js.map +1 -1
- package/build/component/driver/script/npmBuildDriver.js +4 -10
- package/build/component/driver/script/npmBuildDriver.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +4 -10
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +0 -3
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +16 -18
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/share/utils.js +6 -8
- package/build/component/driver/share/utils.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +15 -18
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/configure.js +4 -6
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/constants.d.ts.map +1 -1
- package/build/component/driver/teamsApp/constants.js +57 -57
- package/build/component/driver/teamsApp/constants.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 +10 -12
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +4 -8
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +44 -48
- 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 +158 -163
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js +3 -3
- package/build/component/driver/teamsApp/interfaces/ApiSecretRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.js +1 -1
- package/build/component/driver/teamsApp/interfaces/AsyncAppValidationResponse.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js +4 -4
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IPublishingAppDefinition.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/IPublishingAppDefinition.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appCategory.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appCategory.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appItemHostedCapability.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appItemHostedCapability.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appItemIndustry.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appItemIndustry.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appPackage.d.ts +0 -2
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appPermissionNodeItemType.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/appPermissionNodeItemType.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/disabledScopeItemType.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/disabledScopeItemType.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/staticTab.js +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/staticTab.js.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +11 -14
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/results.js +2 -2
- package/build/component/driver/teamsApp/results.js.map +1 -1
- package/build/component/driver/teamsApp/syncManifest.js +8 -9
- package/build/component/driver/teamsApp/syncManifest.js.map +1 -1
- package/build/component/driver/teamsApp/teamsappMgr.js +3 -5
- package/build/component/driver/teamsApp/teamsappMgr.js.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts +0 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js +10 -15
- package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts +0 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +17 -24
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js +9 -13
- package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +2 -2
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +25 -28
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.js +28 -24
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +12 -15
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/validateTestCases.js +10 -14
- package/build/component/driver/teamsApp/validateTestCases.js.map +1 -1
- package/build/component/driver/typeSpec/compile.js +9 -12
- package/build/component/driver/typeSpec/compile.js.map +1 -1
- package/build/component/driver/util/utils.js +8 -12
- package/build/component/driver/util/utils.js.map +1 -1
- package/build/component/driver/util/wrapUtil.d.ts +1 -1
- package/build/component/driver/util/wrapUtil.d.ts.map +1 -1
- package/build/component/driver/util/wrapUtil.js +14 -13
- package/build/component/driver/util/wrapUtil.js.map +1 -1
- package/build/component/error/componentError.js +12 -6
- package/build/component/error/componentError.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +30 -30
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/feature/createAuthFiles.js +1 -2
- package/build/component/feature/createAuthFiles.js.map +1 -1
- package/build/component/feature/sso.js +3 -5
- package/build/component/feature/sso.js.map +1 -1
- package/build/component/generator/combinedProject/generator.js +9 -7
- package/build/component/generator/combinedProject/generator.js.map +1 -1
- package/build/component/generator/configFiles/configGenerator.js +2 -4
- package/build/component/generator/configFiles/configGenerator.js.map +1 -1
- package/build/component/generator/configFiles/jsonMerger.js +1 -2
- package/build/component/generator/configFiles/jsonMerger.js.map +1 -1
- package/build/component/generator/configFiles/renderTemplate.js +1 -2
- package/build/component/generator/configFiles/renderTemplate.js.map +1 -1
- package/build/component/generator/constant.js +1 -1
- package/build/component/generator/constant.js.map +1 -1
- package/build/component/generator/declarativeAgent/generator.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/generator.js +20 -25
- package/build/component/generator/declarativeAgent/generator.js.map +1 -1
- package/build/component/generator/declarativeAgent/helper.d.ts.map +1 -1
- package/build/component/generator/declarativeAgent/helper.js +10 -15
- package/build/component/generator/declarativeAgent/helper.js.map +1 -1
- package/build/component/generator/declarativeAgent/oneDriveSharePointHandler.js +8 -10
- package/build/component/generator/declarativeAgent/oneDriveSharePointHandler.js.map +1 -1
- package/build/component/generator/defaultGenerator.js +10 -13
- package/build/component/generator/defaultGenerator.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +25 -32
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +0 -2
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +4 -6
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/config/projectProperties.js +2 -2
- package/build/component/generator/officeAddin/config/projectProperties.js.map +1 -1
- package/build/component/generator/officeAddin/generator.d.ts +1 -1
- package/build/component/generator/officeAddin/generator.d.ts.map +1 -1
- package/build/component/generator/officeAddin/generator.js +4 -8
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +2 -2
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/officeAddin/metaOSHelper.js +3 -4
- package/build/component/generator/officeAddin/metaOSHelper.js.map +1 -1
- package/build/component/generator/openApiSpec/common.js +11 -10
- package/build/component/generator/openApiSpec/common.js.map +1 -1
- package/build/component/generator/openApiSpec/customEngineAgentGenerator.js +1 -4
- package/build/component/generator/openApiSpec/customEngineAgentGenerator.js.map +1 -1
- package/build/component/generator/openApiSpec/declarativeAgentGenerator.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/declarativeAgentGenerator.js +1 -12
- package/build/component/generator/openApiSpec/declarativeAgentGenerator.js.map +1 -1
- package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/helper.js +25 -28
- package/build/component/generator/openApiSpec/helper.js.map +1 -1
- package/build/component/generator/openApiSpec/kiota.js +1 -2
- package/build/component/generator/openApiSpec/kiota.js.map +1 -1
- package/build/component/generator/openApiSpec/messageExtensionGenerator.js +1 -4
- package/build/component/generator/openApiSpec/messageExtensionGenerator.js.map +1 -1
- package/build/component/generator/other/ssrTabGenerator.js +4 -1
- package/build/component/generator/other/ssrTabGenerator.js.map +1 -1
- package/build/component/generator/other/tdpGenerator.js +5 -5
- package/build/component/generator/other/tdpGenerator.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +6 -8
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +4 -4
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.js +13 -14
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +30 -41
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +36 -36
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/progress-helper.js +6 -5
- package/build/component/generator/spfx/utils/progress-helper.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetry-helper.js +2 -4
- package/build/component/generator/spfx/utils/telemetry-helper.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +2 -2
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +8 -8
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/templateHelper.js +1 -2
- package/build/component/generator/templateHelper.js.map +1 -1
- package/build/component/generator/templates/metadata/index.d.ts.map +1 -1
- package/build/component/generator/templates/metadata/index.js +7 -7
- package/build/component/generator/templates/metadata/index.js.map +1 -1
- package/build/component/generator/templates/templateNames.d.ts +23 -23
- package/build/component/generator/templates/templateNames.d.ts.map +1 -1
- package/build/component/generator/templates/templateNames.js +1 -1
- package/build/component/generator/templates/templateNames.js.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.d.ts.map +1 -1
- package/build/component/generator/templates/templateReplaceMap.js +21 -26
- package/build/component/generator/templates/templateReplaceMap.js.map +1 -1
- package/build/component/generator/utils.d.ts +1 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +63 -51
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/local/constants.d.ts +1 -1
- package/build/component/local/constants.d.ts.map +1 -1
- package/build/component/local/constants.js +14 -14
- package/build/component/local/constants.js.map +1 -1
- package/build/component/local/localCertificateManager.d.ts.map +1 -1
- package/build/component/local/localCertificateManager.js +7 -10
- package/build/component/local/localCertificateManager.js.map +1 -1
- package/build/component/local/localEnvManager.js +5 -2
- package/build/component/local/localEnvManager.js.map +1 -1
- package/build/component/local/localTelemetryReporter.js +11 -10
- package/build/component/local/localTelemetryReporter.js.map +1 -1
- package/build/component/local/npmLogHelper.js +2 -3
- package/build/component/local/npmLogHelper.js.map +1 -1
- package/build/component/local/packageJsonHelper.d.ts.map +1 -1
- package/build/component/local/packageJsonHelper.js +4 -6
- package/build/component/local/packageJsonHelper.js.map +1 -1
- package/build/component/local/portChecker.js +2 -3
- package/build/component/local/portChecker.js.map +1 -1
- package/build/component/local/process.js +2 -3
- package/build/component/local/process.js.map +1 -1
- package/build/component/local/taskDefinition.js +1 -2
- package/build/component/local/taskDefinition.js.map +1 -1
- package/build/component/m365/constants.js +1 -1
- package/build/component/m365/constants.js.map +1 -1
- package/build/component/m365/interface.js +1 -1
- package/build/component/m365/interface.js.map +1 -1
- package/build/component/m365/launchHelper.d.ts.map +1 -1
- package/build/component/m365/launchHelper.js +15 -15
- package/build/component/m365/launchHelper.js.map +1 -1
- package/build/component/m365/packageService.d.ts.map +1 -1
- package/build/component/m365/packageService.js +73 -87
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +7 -7
- package/build/component/messages.js.map +1 -1
- package/build/component/middleware/actionExecutionMW.js +5 -7
- package/build/component/middleware/actionExecutionMW.js.map +1 -1
- package/build/component/middleware/envMW.js +2 -2
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/middleware/questionMW.js +1 -2
- package/build/component/middleware/questionMW.js.map +1 -1
- package/build/component/migrate.js +12 -16
- package/build/component/migrate.js.map +1 -1
- package/build/component/provisionUtils.js +6 -8
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/interfaces/IBotRegistration.js +1 -1
- package/build/component/resource/botService/appStudio/interfaces/IBotRegistration.js.map +1 -1
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js +6 -7
- package/build/component/resource/botService/botRegistration/botFrameworkRegistration.js.map +1 -1
- package/build/component/resource/botService/botRegistration/utils.js +1 -2
- package/build/component/resource/botService/botRegistration/utils.js.map +1 -1
- package/build/component/resource/botService/common.js +2 -3
- package/build/component/resource/botService/common.js.map +1 -1
- package/build/component/resource/botService/constants.js +17 -17
- package/build/component/resource/botService/constants.js.map +1 -1
- package/build/component/resource/botService/errors.d.ts +5 -5
- package/build/component/resource/botService/errors.d.ts.map +1 -1
- package/build/component/resource/botService/errors.js +8 -2
- package/build/component/resource/botService/errors.js.map +1 -1
- package/build/component/resource/botService/messages.d.ts.map +1 -1
- package/build/component/resource/botService/messages.js +17 -18
- package/build/component/resource/botService/messages.js.map +1 -1
- package/build/component/resource/botService/retryHandler.js +1 -2
- package/build/component/resource/botService/retryHandler.js.map +1 -1
- package/build/component/resource/botService/strings.js +3 -3
- package/build/component/resource/botService/strings.js.map +1 -1
- package/build/component/telemetry.d.ts +1 -1
- package/build/component/telemetry.d.ts.map +1 -1
- package/build/component/telemetry.js +19 -13
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +12 -14
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/azureClient.d.ts.map +1 -1
- package/build/component/utils/azureClient.js +11 -13
- package/build/component/utils/azureClient.js.map +1 -1
- package/build/component/utils/azureResourceOperation.d.ts.map +1 -1
- package/build/component/utils/azureResourceOperation.js +6 -6
- package/build/component/utils/azureResourceOperation.js.map +1 -1
- package/build/component/utils/azureSdkErrorHandler.js +2 -4
- package/build/component/utils/azureSdkErrorHandler.js.map +1 -1
- package/build/component/utils/charsetUtils.js +4 -5
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.d.ts +1 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +13 -14
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/common.d.ts.map +1 -1
- package/build/component/utils/depsChecker/common.js +3 -4
- package/build/component/utils/depsChecker/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts +0 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +10 -15
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envFunctionUtils.js +4 -4
- package/build/component/utils/envFunctionUtils.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +2 -4
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +1 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.d.ts +0 -1
- package/build/component/utils/fileOperation.d.ts.map +1 -1
- package/build/component/utils/fileOperation.js +5 -7
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/component/utils/metadataDAProperties.js +6 -7
- package/build/component/utils/metadataDAProperties.js.map +1 -1
- package/build/component/utils/metadataGraphPermssion.js +3 -5
- package/build/component/utils/metadataGraphPermssion.js.map +1 -1
- package/build/component/utils/metadataRscPermission.js +6 -8
- package/build/component/utils/metadataRscPermission.js.map +1 -1
- package/build/component/utils/metadataUtil.js +22 -16
- package/build/component/utils/metadataUtil.js.map +1 -1
- package/build/component/utils/odrProvider.js +9 -10
- package/build/component/utils/odrProvider.js.map +1 -1
- package/build/component/utils/pathUtils.js +1 -2
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/component/utils/pipelinePolicy.js +3 -2
- package/build/component/utils/pipelinePolicy.js.map +1 -1
- package/build/component/utils/settingsUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.d.ts.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +16 -5
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +4 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.js +9 -7
- package/build/core/FxCore.declarativeAgent.js.map +1 -1
- package/build/core/FxCore.js +256 -200
- package/build/core/FxCore.js.map +1 -1
- package/build/core/callback.d.ts +1 -1
- package/build/core/callback.d.ts.map +1 -1
- package/build/core/callback.js +1 -2
- package/build/core/callback.js.map +1 -1
- package/build/core/collaborator.js +46 -54
- package/build/core/collaborator.js.map +1 -1
- package/build/core/crypto.js +3 -1
- package/build/core/crypto.js.map +1 -1
- package/build/core/environment.js +1 -0
- package/build/core/environment.js.map +1 -1
- package/build/core/environmentName.js +9 -11
- package/build/core/environmentName.js.map +1 -1
- package/build/core/generateConfigFiles.js +3 -5
- package/build/core/generateConfigFiles.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +4 -9
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/contextInjector.d.ts.map +1 -1
- package/build/core/middleware/errorHandler.js +4 -5
- package/build/core/middleware/errorHandler.js.map +1 -1
- package/build/core/middleware/fileLocker.js +1 -2
- package/build/core/middleware/fileLocker.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +33 -35
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectSettingsLoader.js +4 -5
- package/build/core/middleware/projectSettingsLoader.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/retry.js +2 -4
- package/build/core/middleware/retry.js.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +6 -6
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +9 -8
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +7 -9
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/constants.js +13 -13
- package/build/core/middleware/utils/debug/constants.js.map +1 -1
- package/build/core/middleware/utils/debug/debugMigrationContext.js +6 -1
- package/build/core/middleware/utils/debug/debugMigrationContext.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +17 -18
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +25 -32
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/migrationContext.d.ts +0 -1
- package/build/core/middleware/utils/migrationContext.d.ts.map +1 -1
- package/build/core/middleware/utils/migrationContext.js +12 -12
- package/build/core/middleware/utils/migrationContext.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +37 -38
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.d.ts.map +1 -1
- package/build/core/middleware/videoFilterAppBlocker.js +4 -5
- package/build/core/middleware/videoFilterAppBlocker.js.map +1 -1
- package/build/core/share.js +6 -10
- package/build/core/share.js.map +1 -1
- package/build/core/telemetry.js +5 -5
- package/build/core/telemetry.js.map +1 -1
- package/build/error/common.js +4 -4
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.js +2 -4
- package/build/error/deploy.js.map +1 -1
- package/build/error/teamsApp.js.map +1 -1
- package/build/error/types.js +1 -1
- package/build/error/types.js.map +1 -1
- package/build/folder.js +2 -3
- package/build/folder.js.map +1 -1
- package/build/question/collaborator.js +10 -13
- package/build/question/collaborator.js.map +1 -1
- package/build/question/constants.d.ts +1 -1
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +12 -15
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +65 -68
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +3 -4
- package/build/question/generator.js.map +1 -1
- package/build/question/other.js +59 -62
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +2 -2
- 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/question/scaffold/commonNodes.js +9 -13
- package/build/question/scaffold/commonNodes.js.map +1 -1
- package/build/question/scaffold/constructNode.d.ts +2 -2
- package/build/question/scaffold/constructNode.d.ts.map +1 -1
- package/build/question/scaffold/constructNode.js +129 -31
- package/build/question/scaffold/constructNode.js.map +1 -1
- package/build/question/scaffold/vs/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vs/createRootNode.js +4 -4
- package/build/question/scaffold/vs/createRootNode.js.map +1 -1
- package/build/question/scaffold/vsc/CapabilityOptions.d.ts +1 -0
- package/build/question/scaffold/vsc/CapabilityOptions.d.ts.map +1 -1
- package/build/question/scaffold/vsc/CapabilityOptions.js +50 -43
- package/build/question/scaffold/vsc/CapabilityOptions.js.map +1 -1
- package/build/question/scaffold/vsc/ProjectTypeOptions.d.ts.map +1 -1
- package/build/question/scaffold/vsc/ProjectTypeOptions.js +23 -23
- package/build/question/scaffold/vsc/ProjectTypeOptions.js.map +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/createFromTdpNode.js +11 -32
- package/build/question/scaffold/vsc/createFromTdpNode.js.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/createRootNode.js +13 -39
- package/build/question/scaffold/vsc/createRootNode.js.map +1 -1
- package/build/question/scaffold/vsc/daProjectTypeNode.d.ts +1 -2
- package/build/question/scaffold/vsc/daProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/daProjectTypeNode.js +10 -19
- package/build/question/scaffold/vsc/daProjectTypeNode.js.map +1 -1
- package/build/question/scaffold/vsc/rootNode.d.ts +12 -0
- package/build/question/scaffold/vsc/rootNode.d.ts.map +1 -0
- package/build/question/scaffold/vsc/rootNode.js +46 -0
- package/build/question/scaffold/vsc/rootNode.js.map +1 -0
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +4 -0
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +29 -36
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/question/share.js +6 -6
- package/build/question/share.js.map +1 -1
- package/build/question/utils.js +1 -2
- package/build/question/utils.js.map +1 -1
- package/build/ui/validationUtils.d.ts.map +1 -1
- package/build/ui/validationUtils.js +3 -7
- package/build/ui/validationUtils.js.map +1 -1
- package/build/ui/visitor.d.ts +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +10 -12
- package/build/ui/visitor.js.map +1 -1
- package/package.json +23 -22
- package/resource/package.nls.cs.json +1095 -1143
- package/resource/package.nls.de.json +1095 -1143
- package/resource/package.nls.es.json +1095 -1143
- package/resource/package.nls.fr.json +1095 -1143
- package/resource/package.nls.it.json +1095 -1143
- package/resource/package.nls.ja.json +1095 -1143
- package/resource/package.nls.json +1 -56
- package/resource/package.nls.ko.json +1095 -1143
- package/resource/package.nls.pl.json +1095 -1143
- package/resource/package.nls.pt-BR.json +1095 -1143
- package/resource/package.nls.ru.json +1095 -1143
- package/resource/package.nls.tr.json +1095 -1143
- package/resource/package.nls.zh-Hans.json +1095 -1143
- package/resource/package.nls.zh-Hant.json +1095 -1143
- package/resource/package.nls.zh-cn.json +1 -34
- package/resource/package.nls.zh-tw.json +1 -34
- package/resource/templates/package.nls.cs.json +58 -4
- package/resource/templates/package.nls.de.json +58 -4
- package/resource/templates/package.nls.es.json +58 -4
- package/resource/templates/package.nls.fr.json +58 -4
- package/resource/templates/package.nls.it.json +57 -3
- package/resource/templates/package.nls.ja.json +57 -3
- package/resource/templates/package.nls.json +57 -3
- package/resource/templates/package.nls.ko.json +58 -4
- package/resource/templates/package.nls.pl.json +58 -4
- package/resource/templates/package.nls.pt-BR.json +56 -2
- package/resource/templates/package.nls.ru.json +58 -4
- package/resource/templates/package.nls.tr.json +56 -2
- package/resource/templates/package.nls.zh-Hans.json +56 -2
- package/resource/templates/package.nls.zh-Hant.json +56 -2
- package/resource/templates/package.nls.zh-cn.json +55 -1
- package/resource/templates/package.nls.zh-tw.json +55 -1
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/metadata.zip +0 -0
- package/templates/ui/tdpNode.json +330 -0
- package/templates/ui/wizardNode.json +447 -0
- package/build/question/scaffold/vsc/customEngineAgentNode.d.ts +0 -3
- package/build/question/scaffold/vsc/customEngineAgentNode.d.ts.map +0 -1
- package/build/question/scaffold/vsc/customEngineAgentNode.js +0 -28
- package/build/question/scaffold/vsc/customEngineAgentNode.js.map +0 -1
- package/build/question/scaffold/vsc/graphConnectorProjectTypeNode.d.ts +0 -3
- package/build/question/scaffold/vsc/graphConnectorProjectTypeNode.d.ts.map +0 -1
- package/build/question/scaffold/vsc/graphConnectorProjectTypeNode.js +0 -25
- package/build/question/scaffold/vsc/graphConnectorProjectTypeNode.js.map +0 -1
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts +0 -4
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.d.ts.map +0 -1
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js +0 -93
- package/build/question/scaffold/vsc/officeAddinProjectTypeNode.js.map +0 -1
- package/templates/ui/ceaNode.json +0 -30
- package/templates/ui/teamsNode.json +0 -124
|
@@ -2,7 +2,10 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.
|
|
5
|
+
exports.getAuthInfo = getAuthInfo;
|
|
6
|
+
exports.validateSecret = validateSecret;
|
|
7
|
+
exports.validateUrl = validateUrl;
|
|
8
|
+
exports.parseScopes = parseScopes;
|
|
6
9
|
const common_1 = require("../../../utils/common");
|
|
7
10
|
const lodash_1 = require("lodash");
|
|
8
11
|
const constants_1 = require("./constants");
|
|
@@ -23,7 +26,7 @@ async function getAuthInfo(args, context, actionName) {
|
|
|
23
26
|
domain: [args.baseUrl],
|
|
24
27
|
authorizationEndpoint: args.authorizationUrl,
|
|
25
28
|
tokenExchangeEndpoint: args.tokenUrl,
|
|
26
|
-
tokenRefreshEndpoint: args.refreshUrl,
|
|
29
|
+
tokenRefreshEndpoint: args.refreshUrl, // optional
|
|
27
30
|
scopes: parseScopes(args.scope), // optional
|
|
28
31
|
};
|
|
29
32
|
}
|
|
@@ -45,7 +48,6 @@ async function getAuthInfo(args, context, actionName) {
|
|
|
45
48
|
authInfo.scopes = parseScopes(args.scope);
|
|
46
49
|
return authInfo;
|
|
47
50
|
}
|
|
48
|
-
exports.getAuthInfo = getAuthInfo;
|
|
49
51
|
async function getandValidateOauthInfoFromSpec(args, context, actionName) {
|
|
50
52
|
const absolutePath = (0, common_1.getAbsolutePath)(args.apiSpecPath, context.projectPath);
|
|
51
53
|
const listResult = await (0, daSpecParser_1.listAPIInfo)(absolutePath);
|
|
@@ -64,18 +66,10 @@ async function getandValidateOauthInfoFromSpec(args, context, actionName) {
|
|
|
64
66
|
return self.indexOf(value) === index;
|
|
65
67
|
});
|
|
66
68
|
validateDomain(domains, actionName);
|
|
67
|
-
// Need to separate the logic for different flows
|
|
68
|
-
const flow = "flow" in args ? args.flow : "authorizationCode";
|
|
69
69
|
const authInfoArray = operations
|
|
70
70
|
.map((value) => {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
switch (flow) {
|
|
74
|
-
case "authorizationCode":
|
|
75
|
-
default:
|
|
76
|
-
authInfo = ((_a = value.auth) === null || _a === void 0 ? void 0 : _a.authScheme).flows
|
|
77
|
-
.authorizationCode;
|
|
78
|
-
}
|
|
71
|
+
const authInfo = (value.auth?.authScheme).flows
|
|
72
|
+
.authorizationCode;
|
|
79
73
|
return {
|
|
80
74
|
authorizationUrl: authInfo.authorizationUrl,
|
|
81
75
|
tokenUrl: authInfo.tokenUrl,
|
|
@@ -110,7 +104,6 @@ function validateSecret(clientSecret) {
|
|
|
110
104
|
}
|
|
111
105
|
return true;
|
|
112
106
|
}
|
|
113
|
-
exports.validateSecret = validateSecret;
|
|
114
107
|
function validateDomain(domain, actionName) {
|
|
115
108
|
if (domain.length > constants_1.maxDomainPerOauth) {
|
|
116
109
|
throw new oauthDomainInvalid_1.OauthDomainInvalidError(actionName);
|
|
@@ -128,12 +121,10 @@ function validateUrl(baseUrl) {
|
|
|
128
121
|
return false;
|
|
129
122
|
}
|
|
130
123
|
}
|
|
131
|
-
exports.validateUrl = validateUrl;
|
|
132
124
|
function parseScopes(scopes) {
|
|
133
125
|
if (!scopes) {
|
|
134
126
|
return undefined;
|
|
135
127
|
}
|
|
136
128
|
return scopes.split(",").map((scope) => scope.trim());
|
|
137
129
|
}
|
|
138
|
-
exports.parseScopes = parseScopes;
|
|
139
130
|
//# sourceMappingURL=utility.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../../../../src/component/driver/oauth/utility/utility.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare abstract class BaseBuildDriver {
|
|
|
16
16
|
static readonly emptyMap: Map<string, string>;
|
|
17
17
|
abstract buildPrefix: string;
|
|
18
18
|
constructor(args: unknown, context: DriverContext, helpLink?: string);
|
|
19
|
-
protected static asBuildArgs: (data: unknown, helpLink?: string
|
|
19
|
+
protected static asBuildArgs: (data: unknown, helpLink?: string) => BuildArgs;
|
|
20
20
|
protected static toBuildArgs(args: unknown, helpLink?: string): BuildArgs;
|
|
21
21
|
run(): Promise<ExecutionResult>;
|
|
22
22
|
getCommand(): string;
|
|
@@ -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;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,
|
|
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,kDAIzB;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"}
|
|
@@ -14,10 +14,17 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
14
14
|
const messages_1 = require("../../messages");
|
|
15
15
|
const scriptDriver_1 = require("./scriptDriver");
|
|
16
16
|
class BaseBuildDriver {
|
|
17
|
+
args;
|
|
18
|
+
workingDirectory;
|
|
19
|
+
execPath;
|
|
20
|
+
context;
|
|
21
|
+
logProvider;
|
|
22
|
+
progressBar;
|
|
23
|
+
telemetryReporter;
|
|
24
|
+
static emptyMap = new Map();
|
|
17
25
|
constructor(args, context, helpLink) {
|
|
18
|
-
var _a;
|
|
19
26
|
this.args = BaseBuildDriver.toBuildArgs(args, helpLink);
|
|
20
|
-
this.args.workingDirectory =
|
|
27
|
+
this.args.workingDirectory = this.args.workingDirectory ?? "./";
|
|
21
28
|
// if working dir is not absolute path, then join the path with project path
|
|
22
29
|
this.workingDirectory = path.isAbsolute(this.args.workingDirectory)
|
|
23
30
|
? this.args.workingDirectory
|
|
@@ -28,19 +35,22 @@ class BaseBuildDriver {
|
|
|
28
35
|
this.progressBar = context.progressBar;
|
|
29
36
|
this.execPath = this.args.execPath;
|
|
30
37
|
}
|
|
38
|
+
static asBuildArgs = (0, common_1.asFactory)({
|
|
39
|
+
workingDirectory: (0, common_1.asOptional)(common_1.asString),
|
|
40
|
+
args: common_1.asString,
|
|
41
|
+
execPath: (0, common_1.asOptional)(common_1.asString),
|
|
42
|
+
});
|
|
31
43
|
static toBuildArgs(args, helpLink) {
|
|
32
44
|
return BaseBuildDriver.asBuildArgs(args, helpLink);
|
|
33
45
|
}
|
|
34
46
|
async run() {
|
|
35
|
-
var _a;
|
|
36
47
|
const command = this.getCommand();
|
|
37
48
|
// add path to env if execPath is set
|
|
38
49
|
let env = undefined;
|
|
39
50
|
if (this.execPath) {
|
|
40
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
41
51
|
env = { PATH: `${this.execPath}${path.delimiter}${process.env.PATH}` };
|
|
42
52
|
}
|
|
43
|
-
await
|
|
53
|
+
await this.progressBar?.next(messages_1.ProgressMessages.runCommand(command, this.workingDirectory));
|
|
44
54
|
const res = await (0, scriptDriver_1.executeCommand)(command, this.context.projectPath, this.logProvider, this.context.ui, this.workingDirectory, env);
|
|
45
55
|
if (res.isErr()) {
|
|
46
56
|
return {
|
|
@@ -61,10 +71,4 @@ class BaseBuildDriver {
|
|
|
61
71
|
}
|
|
62
72
|
}
|
|
63
73
|
exports.BaseBuildDriver = BaseBuildDriver;
|
|
64
|
-
BaseBuildDriver.emptyMap = new Map();
|
|
65
|
-
BaseBuildDriver.asBuildArgs = (0, common_1.asFactory)({
|
|
66
|
-
workingDirectory: (0, common_1.asOptional)(common_1.asString),
|
|
67
|
-
args: common_1.asString,
|
|
68
|
-
execPath: (0, common_1.asOptional)(common_1.asString),
|
|
69
|
-
});
|
|
70
74
|
//# sourceMappingURL=baseBuildDriver.js.map
|
|
@@ -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,wDAAmG;AAEnG,mDAA6B;AAE7B,iEAAmE;AACnE,6CAAkD;AAClD,iDAAgD;AAEhD,MAAsB,eAAe;
|
|
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,wDAAmG;AAEnG,mDAA6B;AAE7B,iEAAmE;AACnE,6CAAkD;AAClD,iDAAgD;AAEhD,MAAsB,eAAe;IACnC,IAAI,CAAY;IAChB,gBAAgB,CAAS;IACzB,QAAQ,CAAU;IACR,OAAO,CAAgB;IACvB,WAAW,CAAc;IACzB,WAAW,CAAoB;IAC/B,iBAAiB,CAAoB;IAC/C,MAAM,CAAU,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAGrD,YAAY,IAAa,EAAE,OAAsB,EAAE,QAAiB;QAClE,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC;QAChE,4EAA4E;QAC5E,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACjE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IACrC,CAAC;IAES,MAAM,CAAC,WAAW,GAAG,IAAA,kBAAS,EAAY;QAClD,gBAAgB,EAAE,IAAA,mBAAU,EAAC,iBAAQ,CAAC;QACtC,IAAI,EAAE,iBAAQ;QACd,QAAQ,EAAE,IAAA,mBAAU,EAAC,iBAAQ,CAAC;KAC/B,CAAC,CAAC;IAEO,MAAM,CAAC,WAAW,CAAC,IAAa,EAAE,QAAiB;QAC3D,OAAO,eAAe,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,qCAAqC;QACrC,IAAI,GAAG,GAAkC,SAAS,CAAC;QACnD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,GAAG,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QACzE,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,2BAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC1F,MAAM,GAAG,GAAG,MAAM,IAAA,6BAAc,EAC9B,OAAO,EACP,IAAI,CAAC,OAAO,CAAC,WAAW,EACxB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,OAAO,CAAC,EAAE,EACf,IAAI,CAAC,gBAAgB,EACrB,GAAG,CACJ,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAChB,OAAO;gBACL,MAAM,EAAE,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC;gBACtB,SAAS,EAAE,EAAE;aACd,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,IAAA,gBAAE,EAAC,eAAe,CAAC,QAAQ,CAAC;YACpC,SAAS,EAAE;gBACT,IAAA,kCAAkB,EAAC,iCAAiC,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC;aACtF;SACF,CAAC;IACJ,CAAC;IAED,UAAU;QACR,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9E,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,aAAa,EAAE,CAAC;IAChD,CAAC;;AApEH,0CAqEC"}
|
|
@@ -16,10 +16,7 @@ const baseBuildStepDriver_1 = require("./baseBuildStepDriver");
|
|
|
16
16
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
17
17
|
const ACTION_NAME = "cli/runDotnetCommand";
|
|
18
18
|
let DotnetBuildDriver = class DotnetBuildDriver extends baseBuildStepDriver_1.BaseBuildStepDriver {
|
|
19
|
-
|
|
20
|
-
super(...arguments);
|
|
21
|
-
this.description = (0, localizeUtils_1.getLocalizedString)("driver.script.dotnetDescription");
|
|
22
|
-
}
|
|
19
|
+
description = (0, localizeUtils_1.getLocalizedString)("driver.script.dotnetDescription");
|
|
23
20
|
getImpl(args, context) {
|
|
24
21
|
return new DotnetBuildDriverImpl(args, context, "https://aka.ms/teamsfx-actions/cli-run-dotnet-command");
|
|
25
22
|
}
|
|
@@ -27,21 +24,18 @@ let DotnetBuildDriver = class DotnetBuildDriver extends baseBuildStepDriver_1.Ba
|
|
|
27
24
|
return super.execute(args, ctx);
|
|
28
25
|
}
|
|
29
26
|
};
|
|
27
|
+
exports.DotnetBuildDriver = DotnetBuildDriver;
|
|
30
28
|
tslib_1.__decorate([
|
|
31
29
|
(0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
|
|
32
30
|
tslib_1.__metadata("design:type", Function),
|
|
33
31
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
34
32
|
tslib_1.__metadata("design:returntype", Promise)
|
|
35
33
|
], DotnetBuildDriver.prototype, "execute", null);
|
|
36
|
-
DotnetBuildDriver = tslib_1.__decorate([
|
|
34
|
+
exports.DotnetBuildDriver = DotnetBuildDriver = tslib_1.__decorate([
|
|
37
35
|
(0, typedi_1.Service)(ACTION_NAME)
|
|
38
36
|
], DotnetBuildDriver);
|
|
39
|
-
exports.DotnetBuildDriver = DotnetBuildDriver;
|
|
40
37
|
class DotnetBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {
|
|
41
|
-
|
|
42
|
-
super(...arguments);
|
|
43
|
-
this.buildPrefix = "dotnet";
|
|
44
|
-
}
|
|
38
|
+
buildPrefix = "dotnet";
|
|
45
39
|
}
|
|
46
40
|
exports.DotnetBuildDriverImpl = DotnetBuildDriverImpl;
|
|
47
41
|
//# sourceMappingURL=dotnetBuildDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/dotnetBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAGnE,MAAM,WAAW,GAAG,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"dotnetBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/dotnetBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAGnE,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAGpC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,yCAAmB;IAC/C,WAAW,GAAW,IAAA,kCAAkB,EAAC,iCAAiC,CAAC,CAAC;IAErF,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,qBAAqB,CAC9B,IAAI,EACJ,OAAO,EACP,uDAAuD,CACxD,CAAC;IACJ,CAAC;IAGD,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAfY,8CAAiB;AAY5B;IADC,IAAA,aAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;gDAGjF;4BAdU,iBAAiB;IAD7B,IAAA,gBAAO,EAAC,WAAW,CAAC;GACR,iBAAiB,CAe7B;AAED,MAAa,qBAAsB,SAAQ,iCAAe;IACxD,WAAW,GAAG,QAAQ,CAAC;CACxB;AAFD,sDAEC"}
|
|
@@ -16,10 +16,7 @@ const baseBuildStepDriver_1 = require("./baseBuildStepDriver");
|
|
|
16
16
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
17
17
|
const ACTION_NAME = "cli/runNpmCommand";
|
|
18
18
|
let NpmBuildDriver = class NpmBuildDriver extends baseBuildStepDriver_1.BaseBuildStepDriver {
|
|
19
|
-
|
|
20
|
-
super(...arguments);
|
|
21
|
-
this.description = (0, localizeUtils_1.getLocalizedString)("driver.script.npmDescription");
|
|
22
|
-
}
|
|
19
|
+
description = (0, localizeUtils_1.getLocalizedString)("driver.script.npmDescription");
|
|
23
20
|
getImpl(args, context) {
|
|
24
21
|
return new NpmBuildDriverImpl(args, context, "https://aka.ms/teamsfx-actions/cli-run-npm-command");
|
|
25
22
|
}
|
|
@@ -27,21 +24,18 @@ let NpmBuildDriver = class NpmBuildDriver extends baseBuildStepDriver_1.BaseBuil
|
|
|
27
24
|
return super.execute(args, ctx);
|
|
28
25
|
}
|
|
29
26
|
};
|
|
27
|
+
exports.NpmBuildDriver = NpmBuildDriver;
|
|
30
28
|
tslib_1.__decorate([
|
|
31
29
|
(0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
|
|
32
30
|
tslib_1.__metadata("design:type", Function),
|
|
33
31
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
34
32
|
tslib_1.__metadata("design:returntype", Promise)
|
|
35
33
|
], NpmBuildDriver.prototype, "execute", null);
|
|
36
|
-
NpmBuildDriver = tslib_1.__decorate([
|
|
34
|
+
exports.NpmBuildDriver = NpmBuildDriver = tslib_1.__decorate([
|
|
37
35
|
(0, typedi_1.Service)(ACTION_NAME)
|
|
38
36
|
], NpmBuildDriver);
|
|
39
|
-
exports.NpmBuildDriver = NpmBuildDriver;
|
|
40
37
|
class NpmBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {
|
|
41
|
-
|
|
42
|
-
super(...arguments);
|
|
43
|
-
this.buildPrefix = "npm";
|
|
44
|
-
}
|
|
38
|
+
buildPrefix = "npm";
|
|
45
39
|
}
|
|
46
40
|
exports.NpmBuildDriverImpl = NpmBuildDriverImpl;
|
|
47
41
|
//# sourceMappingURL=npmBuildDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npmBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npmBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAGnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"npmBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npmBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;AAEH,uDAAoD;AACpD,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,+DAA4D;AAC5D,iEAAmE;AAGnE,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGjC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,yCAAmB;IAC5C,WAAW,GAAW,IAAA,kCAAkB,EAAC,8BAA8B,CAAC,CAAC;IAElF,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,kBAAkB,CAC3B,IAAI,EACJ,OAAO,EACP,oDAAoD,CACrD,CAAC;IACJ,CAAC;IAGD,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;CACF,CAAA;AAfY,wCAAc;AAYzB;IADC,IAAA,aAAK,EAAC,CAAC,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;6CAGjF;yBAdU,cAAc;IAD1B,IAAA,gBAAO,EAAC,WAAW,CAAC;GACR,cAAc,CAe1B;AAED,MAAa,kBAAmB,SAAQ,iCAAe;IACrD,WAAW,GAAG,KAAK,CAAC;CACrB;AAFD,gDAEC"}
|
|
@@ -14,10 +14,7 @@ const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
|
14
14
|
const addSWADeployTelemetry_1 = require("../middleware/addSWADeployTelemetry");
|
|
15
15
|
const ACTION_NAME = "cli/runNpxCommand";
|
|
16
16
|
let NpxBuildDriver = class NpxBuildDriver extends baseBuildStepDriver_1.BaseBuildStepDriver {
|
|
17
|
-
|
|
18
|
-
super(...arguments);
|
|
19
|
-
this.description = (0, localizeUtils_1.getLocalizedString)("driver.script.npxDescription");
|
|
20
|
-
}
|
|
17
|
+
description = (0, localizeUtils_1.getLocalizedString)("driver.script.npxDescription");
|
|
21
18
|
execute(args, ctx) {
|
|
22
19
|
return super.execute(args, ctx);
|
|
23
20
|
}
|
|
@@ -25,6 +22,7 @@ let NpxBuildDriver = class NpxBuildDriver extends baseBuildStepDriver_1.BaseBuil
|
|
|
25
22
|
return new NpxBuildDriverImpl(args, context, "https://aka.ms/teamsfx-actions/cli-run-npx-command");
|
|
26
23
|
}
|
|
27
24
|
};
|
|
25
|
+
exports.NpxBuildDriver = NpxBuildDriver;
|
|
28
26
|
tslib_1.__decorate([
|
|
29
27
|
(0, hooks_1.hooks)([
|
|
30
28
|
(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT),
|
|
@@ -34,15 +32,11 @@ tslib_1.__decorate([
|
|
|
34
32
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
35
33
|
tslib_1.__metadata("design:returntype", Promise)
|
|
36
34
|
], NpxBuildDriver.prototype, "execute", null);
|
|
37
|
-
NpxBuildDriver = tslib_1.__decorate([
|
|
35
|
+
exports.NpxBuildDriver = NpxBuildDriver = tslib_1.__decorate([
|
|
38
36
|
(0, typedi_1.Service)(ACTION_NAME)
|
|
39
37
|
], NpxBuildDriver);
|
|
40
|
-
exports.NpxBuildDriver = NpxBuildDriver;
|
|
41
38
|
class NpxBuildDriverImpl extends baseBuildDriver_1.BaseBuildDriver {
|
|
42
|
-
|
|
43
|
-
super(...arguments);
|
|
44
|
-
this.buildPrefix = "npx";
|
|
45
|
-
}
|
|
39
|
+
buildPrefix = "npx";
|
|
46
40
|
}
|
|
47
41
|
exports.NpxBuildDriverImpl = NpxBuildDriverImpl;
|
|
48
42
|
//# sourceMappingURL=npxBuildDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npxBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npxBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAoD;AACpD,mCAAiC;AAGjC,+DAA4D;AAC5D,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,iEAAmE;AAEnE,+EAA4E;AAE5E,MAAM,WAAW,GAAG,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"npxBuildDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/npxBuildDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,uDAAoD;AACpD,mCAAiC;AAGjC,+DAA4D;AAC5D,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,iEAAmE;AAEnE,+EAA4E;AAE5E,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAGjC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,yCAAmB;IAC5C,WAAW,GAAW,IAAA,kCAAkB,EAAC,8BAA8B,CAAC,CAAC;IAMlF,OAAO,CAAC,IAAa,EAAE,GAAkB;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,OAAsB;QAC3C,OAAO,IAAI,kBAAkB,CAC3B,IAAI,EACJ,OAAO,EACP,oDAAoD,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AAlBY,wCAAc;AAOzB;IAJC,IAAA,aAAK,EAAC;QACL,IAAA,iDAAuB,EAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC;QACxE,IAAA,6CAAqB,EAAC,WAAW,CAAC;KACnC,CAAC;;;;6CAGD;yBATU,cAAc;IAD1B,IAAA,gBAAO,EAAC,WAAW,CAAC;GACR,cAAc,CAkB1B;AAED,MAAa,kBAAmB,SAAQ,iCAAe;IACrD,WAAW,GAAG,KAAK,CAAC;CACrB;AAFD,gDAEC"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
/// <reference types="node" />
|
|
4
1
|
import { FxError, LogProvider, Result } from "@microsoft/teamsfx-api";
|
|
5
2
|
import child_process from "child_process";
|
|
6
3
|
import { ScriptExecutionError, ScriptTimeoutError } from "../../../error/script";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scriptDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAC/E,OAAO,aAAa,MAAM,eAAe,CAAC;AAK1C,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKtE,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgBhE;AAED,qBACa,YAAa,YAAW,UAAU;IACvC,IAAI,CACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAoB1C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAM3E;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,CA4FlD;AAED,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAClC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAOxB;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,CAUlE"}
|
|
@@ -2,7 +2,13 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.
|
|
5
|
+
exports.scriptDriver = exports.ScriptDriver = void 0;
|
|
6
|
+
exports.defaultShell = defaultShell;
|
|
7
|
+
exports.executeCommand = executeCommand;
|
|
8
|
+
exports.getStderrHandler = getStderrHandler;
|
|
9
|
+
exports.bufferToString = bufferToString;
|
|
10
|
+
exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
|
|
11
|
+
exports.parseSetOutputCommand = parseSetOutputCommand;
|
|
6
12
|
const tslib_1 = require("tslib");
|
|
7
13
|
/**
|
|
8
14
|
* @author huajiezhang <huajiezhang@microsoft.com>
|
|
@@ -46,11 +52,9 @@ async function defaultShell() {
|
|
|
46
52
|
}
|
|
47
53
|
return undefined;
|
|
48
54
|
}
|
|
49
|
-
exports.defaultShell = defaultShell;
|
|
50
55
|
let ScriptDriver = class ScriptDriver {
|
|
51
56
|
async _run(typedArgs, context) {
|
|
52
|
-
|
|
53
|
-
await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next("Running script"));
|
|
57
|
+
await context.progressBar?.next("Running script");
|
|
54
58
|
const res = await executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
|
|
55
59
|
if (res.isErr())
|
|
56
60
|
return (0, teamsfx_api_1.err)(res.error);
|
|
@@ -65,27 +69,27 @@ let ScriptDriver = class ScriptDriver {
|
|
|
65
69
|
return { result: res, summaries: summaries };
|
|
66
70
|
}
|
|
67
71
|
};
|
|
72
|
+
exports.ScriptDriver = ScriptDriver;
|
|
68
73
|
tslib_1.__decorate([
|
|
69
74
|
(0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
|
|
70
75
|
tslib_1.__metadata("design:type", Function),
|
|
71
76
|
tslib_1.__metadata("design:paramtypes", [Object, Object]),
|
|
72
77
|
tslib_1.__metadata("design:returntype", Promise)
|
|
73
78
|
], ScriptDriver.prototype, "execute", null);
|
|
74
|
-
ScriptDriver = tslib_1.__decorate([
|
|
79
|
+
exports.ScriptDriver = ScriptDriver = tslib_1.__decorate([
|
|
75
80
|
(0, typedi_1.Service)(ACTION_NAME)
|
|
76
81
|
], ScriptDriver);
|
|
77
|
-
exports.ScriptDriver = ScriptDriver;
|
|
78
82
|
exports.scriptDriver = new ScriptDriver();
|
|
79
83
|
async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
|
|
80
84
|
const workingDir = pathUtils_1.pathUtils.resolveFilePath(projectPath, workingDirectory);
|
|
81
85
|
env = env || {};
|
|
82
|
-
if (ui
|
|
86
|
+
if (ui?.runCommand) {
|
|
83
87
|
const res = await ui.runCommand({
|
|
84
88
|
cmd: command,
|
|
85
89
|
workingDirectory: workingDir,
|
|
86
90
|
timeout: timeout,
|
|
87
91
|
shell: shell,
|
|
88
|
-
env:
|
|
92
|
+
env: { ...process.env, ...env },
|
|
89
93
|
});
|
|
90
94
|
if (res.isErr()) {
|
|
91
95
|
return (0, teamsfx_api_1.err)(convertScriptErrorToFxError(res.error, command));
|
|
@@ -104,7 +108,6 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
104
108
|
}
|
|
105
109
|
const dshell = await defaultShell();
|
|
106
110
|
return new Promise((resolve) => {
|
|
107
|
-
var _a, _b;
|
|
108
111
|
const finalShell = shell || dshell;
|
|
109
112
|
const finalCmd = command;
|
|
110
113
|
let appendFile = undefined;
|
|
@@ -117,7 +120,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
117
120
|
shell: finalShell,
|
|
118
121
|
cwd: workingDir,
|
|
119
122
|
encoding: systemEncoding,
|
|
120
|
-
env:
|
|
123
|
+
env: { ...process.env, ...env },
|
|
121
124
|
timeout: timeout,
|
|
122
125
|
})}.`);
|
|
123
126
|
const allOutputStrings = [];
|
|
@@ -127,7 +130,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
127
130
|
shell: finalShell,
|
|
128
131
|
cwd: workingDir,
|
|
129
132
|
encoding: "buffer",
|
|
130
|
-
env:
|
|
133
|
+
env: { ...process.env, ...env },
|
|
131
134
|
timeout: timeout,
|
|
132
135
|
}, (error) => {
|
|
133
136
|
if (error) {
|
|
@@ -151,16 +154,15 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
|
|
|
151
154
|
fs_extra_1.default.appendFileSync(appendFile, data);
|
|
152
155
|
}
|
|
153
156
|
};
|
|
154
|
-
|
|
157
|
+
cp.stdout?.on("data", (data) => {
|
|
155
158
|
const str = bufferToString(data, systemEncoding);
|
|
156
159
|
logProvider.info(` [script stdout] ${(0, stringUtils_1.maskSecret)(str, { replace: "***" })}`);
|
|
157
160
|
dataHandler(str);
|
|
158
161
|
});
|
|
159
162
|
const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
|
|
160
|
-
|
|
163
|
+
cp.stderr?.on("data", handler);
|
|
161
164
|
});
|
|
162
165
|
}
|
|
163
|
-
exports.executeCommand = executeCommand;
|
|
164
166
|
function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
|
|
165
167
|
return (data) => {
|
|
166
168
|
const str = bufferToString(data, systemEncoding);
|
|
@@ -169,14 +171,12 @@ function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandle
|
|
|
169
171
|
stderrStrings.push(str);
|
|
170
172
|
};
|
|
171
173
|
}
|
|
172
|
-
exports.getStderrHandler = getStderrHandler;
|
|
173
174
|
function bufferToString(data, systemEncoding) {
|
|
174
175
|
const str = systemEncoding === "utf8" || systemEncoding === "utf-8"
|
|
175
176
|
? data.toString()
|
|
176
177
|
: iconv_lite_1.default.decode(data, systemEncoding);
|
|
177
178
|
return str;
|
|
178
179
|
}
|
|
179
|
-
exports.bufferToString = bufferToString;
|
|
180
180
|
function convertScriptErrorToFxError(error, run) {
|
|
181
181
|
if (error.killed) {
|
|
182
182
|
return new script_1.ScriptTimeoutError(error, run);
|
|
@@ -185,7 +185,6 @@ function convertScriptErrorToFxError(error, run) {
|
|
|
185
185
|
return new script_1.ScriptExecutionError(error, run);
|
|
186
186
|
}
|
|
187
187
|
}
|
|
188
|
-
exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
|
|
189
188
|
function parseSetOutputCommand(stdout) {
|
|
190
189
|
const regex = /::(set-teamsfx-env|set-output)\s+(\w+)=((["'])(.*?)\4|[^"'\s]+)/g;
|
|
191
190
|
const output = {};
|
|
@@ -197,5 +196,4 @@ function parseSetOutputCommand(stdout) {
|
|
|
197
196
|
}
|
|
198
197
|
return output;
|
|
199
198
|
}
|
|
200
|
-
exports.parseSetOutputCommand = parseSetOutputCommand;
|
|
201
199
|
//# sourceMappingURL=scriptDriver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.parseShareAppActionYamlConfig =
|
|
5
|
+
exports.parseShareAppActionYamlConfig = parseShareAppActionYamlConfig;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
8
|
const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
|
|
@@ -18,7 +18,6 @@ const acquire_1 = require("../m365/acquire");
|
|
|
18
18
|
const constants_1 = require("../teamsApp/constants");
|
|
19
19
|
// Read m365agents.yaml and get the value of shared title id, and shared app id
|
|
20
20
|
async function parseShareAppActionYamlConfig(projectPath) {
|
|
21
|
-
var _a, _b, _c, _d, _e;
|
|
22
21
|
const templatePath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
|
|
23
22
|
const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath);
|
|
24
23
|
if (maybeProjectModel.isErr()) {
|
|
@@ -34,13 +33,13 @@ async function parseShareAppActionYamlConfig(projectPath) {
|
|
|
34
33
|
(!projectModel.deploy || !projectModel.deploy.driverDefs)) {
|
|
35
34
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.yamlConfigNotFound")));
|
|
36
35
|
}
|
|
37
|
-
const extendToM365Action =
|
|
38
|
-
|
|
36
|
+
const extendToM365Action = projectModel.provision?.driverDefs.find((d) => d.uses === acquire_1.actionName) ||
|
|
37
|
+
projectModel.deploy?.driverDefs.find((d) => d.uses === acquire_1.actionName);
|
|
39
38
|
if (!extendToM365Action) {
|
|
40
39
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", acquire_1.actionName)));
|
|
41
40
|
}
|
|
42
41
|
// 1. get manifest id
|
|
43
|
-
const appPackagePath =
|
|
42
|
+
const appPackagePath = extendToM365Action.with?.appPackagePath;
|
|
44
43
|
if (!appPackagePath) {
|
|
45
44
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageConfigNotFound")));
|
|
46
45
|
}
|
|
@@ -64,8 +63,8 @@ async function parseShareAppActionYamlConfig(projectPath) {
|
|
|
64
63
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.manifestIdNotFound")));
|
|
65
64
|
}
|
|
66
65
|
// 2. get shared title id and shared app id
|
|
67
|
-
const sharedTitleIdEnvName =
|
|
68
|
-
const sharedAppIdEnvName =
|
|
66
|
+
const sharedTitleIdEnvName = extendToM365Action.writeToEnvironmentFile?.titleId;
|
|
67
|
+
const sharedAppIdEnvName = extendToM365Action.writeToEnvironmentFile?.appId;
|
|
69
68
|
if (!sharedTitleIdEnvName || !sharedAppIdEnvName) {
|
|
70
69
|
return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.sharedConfigNotFound")));
|
|
71
70
|
}
|
|
@@ -77,5 +76,4 @@ async function parseShareAppActionYamlConfig(projectPath) {
|
|
|
77
76
|
}
|
|
78
77
|
return (0, teamsfx_api_1.ok)({ teamsappId: manifestId, titleId: sharedTitleId, appId: sharedAppId });
|
|
79
78
|
}
|
|
80
|
-
exports.parseShareAppActionYamlConfig = parseShareAppActionYamlConfig;
|
|
81
79
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"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"}
|