@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.266fa3b9f.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 +2 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +2 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/featureFlags.d.ts +3 -0
- package/build/common/featureFlags.d.ts.map +1 -0
- package/build/common/featureFlags.js +24 -0
- package/build/common/featureFlags.js.map +1 -0
- package/build/common/local/localEnvManager.d.ts +1 -1
- package/build/common/local/localEnvManager.d.ts.map +1 -1
- package/build/common/local/localEnvManager.js +1 -1
- package/build/common/local/localEnvManager.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +6 -4
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples-config.json +29 -15
- package/build/common/samples.d.ts +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +3 -2
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +9 -0
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +9 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +4 -3
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +31 -28
- package/build/common/tools.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 +69 -13
- package/build/core/FxCore.js.map +1 -1
- package/build/core/environment.d.ts +1 -1
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +6 -1
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +1 -0
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +5 -1
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/aadManifestMigration.d.ts +3 -0
- package/build/core/middleware/aadManifestMigration.d.ts.map +1 -0
- package/build/core/middleware/aadManifestMigration.js +207 -0
- package/build/core/middleware/aadManifestMigration.js.map +1 -0
- package/build/core/middleware/consolidateLocalRemote.d.ts +2 -0
- package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.js +80 -51
- package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +11 -55
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/question.d.ts +2 -8
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +68 -52
- package/build/core/question.js.map +1 -1
- package/build/core/telemetry.d.ts +23 -0
- package/build/core/telemetry.d.ts.map +1 -0
- package/build/core/telemetry.js +46 -0
- package/build/core/telemetry.js.map +1 -0
- package/build/plugins/resource/aad/constants.d.ts +3 -0
- package/build/plugins/resource/aad/constants.d.ts.map +1 -1
- package/build/plugins/resource/aad/constants.js +3 -0
- package/build/plugins/resource/aad/constants.js.map +1 -1
- package/build/plugins/resource/aad/errors.d.ts +2 -0
- package/build/plugins/resource/aad/errors.d.ts.map +1 -1
- package/build/plugins/resource/aad/errors.js +15 -1
- package/build/plugins/resource/aad/errors.js.map +1 -1
- package/build/plugins/resource/aad/index.d.ts.map +1 -1
- package/build/plugins/resource/aad/index.js +4 -0
- package/build/plugins/resource/aad/index.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +3 -0
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +105 -19
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts +2 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +18 -3
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/apiconnector/checker.d.ts +6 -0
- package/build/plugins/resource/apiconnector/checker.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/checker.js +54 -0
- package/build/plugins/resource/apiconnector/checker.js.map +1 -0
- package/build/plugins/resource/apiconnector/config.d.ts +23 -0
- package/build/plugins/resource/apiconnector/config.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/config.js +5 -0
- package/build/plugins/resource/apiconnector/config.js.map +1 -0
- package/build/plugins/resource/apiconnector/constants.d.ts +24 -0
- package/build/plugins/resource/apiconnector/constants.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/constants.js +33 -7
- package/build/plugins/resource/apiconnector/constants.js.map +1 -1
- package/build/plugins/resource/apiconnector/depsHandler.d.ts +12 -0
- package/build/plugins/resource/apiconnector/depsHandler.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/depsHandler.js +66 -0
- package/build/plugins/resource/apiconnector/depsHandler.js.map +1 -0
- package/build/plugins/resource/apiconnector/envHandler.d.ts +3 -2
- package/build/plugins/resource/apiconnector/envHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/envHandler.js +35 -25
- package/build/plugins/resource/apiconnector/envHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/errors.d.ts +13 -1
- package/build/plugins/resource/apiconnector/errors.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/errors.js +19 -7
- package/build/plugins/resource/apiconnector/errors.js.map +1 -1
- package/build/plugins/resource/apiconnector/index.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/index.js +1 -8
- package/build/plugins/resource/apiconnector/index.js.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.d.ts +12 -2
- package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.js +240 -31
- package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
- package/build/plugins/resource/apiconnector/questions.d.ts +26 -3
- package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/questions.js +100 -22
- package/build/plugins/resource/apiconnector/questions.js.map +1 -1
- package/build/plugins/resource/apiconnector/result.d.ts +2 -1
- package/build/plugins/resource/apiconnector/result.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/result.js.map +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.d.ts +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/sampleHandler.js +7 -3
- package/build/plugins/resource/apiconnector/sampleHandler.js.map +1 -1
- package/build/plugins/resource/apiconnector/utils.d.ts +18 -20
- package/build/plugins/resource/apiconnector/utils.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/utils.js +89 -16
- package/build/plugins/resource/apiconnector/utils.js.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/appStudio.js +6 -5
- package/build/plugins/resource/appstudio/appStudio.js.map +1 -1
- package/build/plugins/resource/appstudio/constants.d.ts +1 -0
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +23 -1
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/index.js +17 -10
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts +2 -2
- package/build/plugins/resource/appstudio/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +27 -5
- package/build/plugins/resource/appstudio/manifestTemplate.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +3 -1
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +1 -1
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.js +5 -0
- package/build/plugins/resource/appstudio/v3/plugin.js.map +1 -1
- package/build/plugins/resource/bot/azureOps.d.ts +0 -1
- package/build/plugins/resource/bot/azureOps.d.ts.map +1 -1
- package/build/plugins/resource/bot/azureOps.js +0 -28
- package/build/plugins/resource/bot/azureOps.js.map +1 -1
- package/build/plugins/resource/bot/clientFactory.d.ts +0 -5
- package/build/plugins/resource/bot/clientFactory.d.ts.map +1 -1
- package/build/plugins/resource/bot/clientFactory.js +1 -29
- package/build/plugins/resource/bot/clientFactory.js.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.d.ts +1 -0
- package/build/plugins/resource/bot/configs/teamsBotConfig.d.ts.map +1 -1
- package/build/plugins/resource/bot/configs/teamsBotConfig.js +15 -13
- package/build/plugins/resource/bot/configs/teamsBotConfig.js.map +1 -1
- package/build/plugins/resource/bot/constants.d.ts +2 -9
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +1 -8
- package/build/plugins/resource/bot/constants.js.map +1 -1
- package/build/plugins/resource/bot/errors.d.ts +0 -18
- package/build/plugins/resource/bot/errors.d.ts.map +1 -1
- package/build/plugins/resource/bot/errors.js +1 -38
- package/build/plugins/resource/bot/errors.js.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.d.ts.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js +10 -4
- package/build/plugins/resource/bot/functionsHostedBot/deployMgr.js.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/functionsHostedBot/plugin.js +2 -6
- package/build/plugins/resource/bot/functionsHostedBot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.d.ts.map +1 -1
- package/build/plugins/resource/bot/languageStrategy.js +3 -1
- package/build/plugins/resource/bot/languageStrategy.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +4 -1
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/question.d.ts +1 -0
- package/build/plugins/resource/bot/question.d.ts.map +1 -1
- package/build/plugins/resource/bot/question.js +2 -0
- package/build/plugins/resource/bot/question.js.map +1 -1
- package/build/plugins/resource/frontend/constants.d.ts +4 -0
- package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/constants.js +6 -2
- package/build/plugins/resource/frontend/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/env.js +2 -2
- package/build/plugins/resource/frontend/env.js.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.d.ts +3 -5
- package/build/plugins/resource/frontend/ops/deploy.d.ts.map +1 -1
- package/build/plugins/resource/frontend/ops/deploy.js +41 -7
- package/build/plugins/resource/frontend/ops/deploy.js.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +5 -6
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts +1 -1
- package/build/plugins/resource/frontend/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/frontend/resources/errors.js +4 -4
- package/build/plugins/resource/frontend/resources/errors.js.map +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.js.map +1 -1
- package/build/plugins/resource/frontend/utils/progress-helper.d.ts +2 -2
- package/build/plugins/resource/frontend/utils/progress-helper.d.ts.map +1 -1
- package/build/plugins/resource/frontend/utils/progress-helper.js +4 -4
- package/build/plugins/resource/frontend/utils/progress-helper.js.map +1 -1
- package/build/plugins/resource/frontend/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v3/index.js +10 -13
- package/build/plugins/resource/frontend/v3/index.js.map +1 -1
- package/build/plugins/resource/sql/errors.d.ts.map +1 -1
- package/build/plugins/resource/sql/errors.js +29 -29
- package/build/plugins/resource/sql/errors.js.map +1 -1
- package/build/plugins/resource/sql/sqlClient.d.ts.map +1 -1
- package/build/plugins/resource/sql/sqlClient.js +2 -8
- package/build/plugins/resource/sql/sqlClient.js.map +1 -1
- package/build/plugins/solution/fx-solution/arm.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/arm.js +15 -9
- package/build/plugins/solution/fx-solution/arm.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +17 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +20 -1
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js +0 -26
- package/build/plugins/solution/fx-solution/debug/util/launchNext.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +5 -3
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +62 -34
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/deploy.js +14 -5
- package/build/plugins/solution/fx-solution/v2/deploy.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts +2 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js +146 -95
- package/build/plugins/solution/fx-solution/v2/executeUserTask.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js +85 -57
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provision.js +21 -8
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +9 -1
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +5 -4
- package/resource/package.nls.json +133 -64
- package/resource/unify-config-change-logs.md +19 -0
- package/templates/core/README.md +46 -0
- package/templates/fallback/blazor-base.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/{bot-msgext.js.default.zip → bot.js.m365.zip} +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/{bot-msgext.ts.default.zip → bot.ts.m365.zip} +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.notification.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/aad/auth/bot/README.md +63 -0
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +65 -0
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-start.html +177 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/showUserInfo.js +19 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/ssoDialog.js +173 -0
- package/templates/plugins/resource/aad/auth/bot/js/sso/teamsSsoBot.js +55 -0
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +65 -0
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-start.html +177 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/showUserInfo.ts +24 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/ssoDialog.ts +182 -0
- package/templates/plugins/resource/aad/auth/bot/ts/sso/teamsSsoBot.ts +69 -0
- package/templates/plugins/resource/aad/auth/tab/README.md +49 -0
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +58 -0
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +57 -0
- package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx +34 -0
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +58 -0
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +57 -0
- package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx +34 -0
- package/templates/plugins/resource/aad/manifest/aad.template.json +1 -14
- package/templates/plugins/resource/apiconnector/package.json +6 -0
- package/templates/plugins/resource/apiconnector/sample/{ts/api-connector.template → comment.template} +13 -14
- package/templates/plugins/resource/apiconnector/sample/js/aad.template +26 -0
- package/templates/plugins/resource/apiconnector/sample/js/apiKey.template +19 -0
- package/templates/plugins/resource/apiconnector/sample/js/basic.template +14 -0
- package/templates/plugins/resource/apiconnector/sample/js/cert.template +15 -0
- package/templates/plugins/resource/apiconnector/sample/js/custom.template +39 -0
- package/templates/plugins/resource/apiconnector/sample/ts/aad.template +31 -0
- package/templates/plugins/resource/apiconnector/sample/ts/apiKey.template +16 -0
- package/templates/plugins/resource/apiconnector/sample/ts/basic.template +14 -0
- package/templates/plugins/resource/apiconnector/sample/ts/cert.template +17 -0
- package/templates/plugins/resource/apiconnector/sample/ts/custom.template +42 -0
- package/templates/plugins/resource/bot/bicep/botProvision.template.bicep +9 -0
- package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep +2 -0
- package/templates/plugins/resource/function/bicep/functionProvision.template.bicep +2 -0
- package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep +4 -0
- package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep +2 -0
- package/templates/core/README-auto-generated.md +0 -31
- package/templates/fallback/bot-msgext.csharp.default.zip +0 -0
- package/templates/fallback/msgext.js.default.zip +0 -0
- package/templates/fallback/msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/apiconnector/sample/js/api-connector.template +0 -30
|
@@ -36,32 +36,32 @@ async function getQuestionsForScaffolding(ctx, inputs) {
|
|
|
36
36
|
question_1.CommandAndResponseOptionItem.id,
|
|
37
37
|
question_1.MessageExtensionItem.id,
|
|
38
38
|
...(tools_1.isAadManifestEnabled() ? [question_1.TabNonSsoItem.id] : []),
|
|
39
|
+
question_1.M365SsoLaunchPageOptionItem.id,
|
|
40
|
+
question_1.M365SearchAppOptionItem.id,
|
|
39
41
|
],
|
|
40
42
|
};
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
node.addChild(spfxNode);
|
|
64
|
-
}
|
|
43
|
+
// 1.1.1 SPFX Tab
|
|
44
|
+
const spfxPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.SpfxPlugin);
|
|
45
|
+
if (spfxPlugin.getQuestionsForScaffolding) {
|
|
46
|
+
const res = await spfxPlugin.getQuestionsForScaffolding(ctx, inputs);
|
|
47
|
+
if (res.isErr())
|
|
48
|
+
return res;
|
|
49
|
+
if (res.value) {
|
|
50
|
+
const spfxNode = res.value;
|
|
51
|
+
spfxNode.condition = {
|
|
52
|
+
validFunc: (input, inputs) => {
|
|
53
|
+
if (!inputs) {
|
|
54
|
+
return "Invalid inputs";
|
|
55
|
+
}
|
|
56
|
+
const cap = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
|
|
57
|
+
if (cap.includes(question_1.TabSPFxItem.id)) {
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
return "SPFx is not selected";
|
|
61
|
+
},
|
|
62
|
+
};
|
|
63
|
+
if (spfxNode.data)
|
|
64
|
+
node.addChild(spfxNode);
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
}
|
|
@@ -69,7 +69,7 @@ async function getQuestionsForScaffolding(ctx, inputs) {
|
|
|
69
69
|
node.condition = { containsAny: [question_1.TabOptionItem.id, question_1.BotOptionItem.id, question_1.MessageExtensionItem.id] };
|
|
70
70
|
}
|
|
71
71
|
// 1.1.2 Azure Tab
|
|
72
|
-
const tabRes = await getTabScaffoldQuestionsV2(ctx, inputs, teamsfx_api_1.CLIPlatforms.includes(inputs.platform) // only CLI and CLI_HELP support azure-resources question
|
|
72
|
+
const tabRes = await getTabScaffoldQuestionsV2(ctx, inputs, !tools_1.isGAPreviewEnabled() && teamsfx_api_1.CLIPlatforms.includes(inputs.platform) // only CLI and CLI_HELP support azure-resources question
|
|
73
73
|
);
|
|
74
74
|
if (tabRes.isErr())
|
|
75
75
|
return tabRes;
|
|
@@ -223,11 +223,14 @@ async function getQuestions(ctx, inputs, envInfo, tokenProvider) {
|
|
|
223
223
|
else {
|
|
224
224
|
plugins = ResourcePluginContainer_1.getAllV2ResourcePlugins();
|
|
225
225
|
}
|
|
226
|
-
plugins = plugins.filter((plugin) => !!plugin.deploy &&
|
|
227
|
-
|
|
228
|
-
if (plugins.length === 0) {
|
|
226
|
+
plugins = plugins.filter((plugin) => !!plugin.deploy && plugin.displayName !== "AAD");
|
|
227
|
+
if (plugins.length === 0 && inputs.skipAadDeploy !== "no") {
|
|
229
228
|
return teamsfx_api_1.err(new error_1.NoCapabilityFoundError(teamsfx_api_1.Stage.deploy));
|
|
230
229
|
}
|
|
230
|
+
// trigger from Deploy AAD App manifest command in VSCode
|
|
231
|
+
if (inputs.platform === teamsfx_api_1.Platform.VSCode && inputs.skipAadDeploy === "no") {
|
|
232
|
+
return teamsfx_api_1.ok(node);
|
|
233
|
+
}
|
|
231
234
|
// On VS, users are not expected to select plugins to deploy.
|
|
232
235
|
if (!projectSettingsHelper_1.isVSProject(ctx.projectSetting)) {
|
|
233
236
|
const pluginPrefix = "fx-resource-";
|
|
@@ -333,7 +336,7 @@ async function getQuestionsForAddCapability(ctx, inputs, func, envInfo, tokenPro
|
|
|
333
336
|
const settings = ctx.projectSetting.solutionSettings;
|
|
334
337
|
const addCapQuestion = {
|
|
335
338
|
name: question_1.AzureSolutionQuestionNames.Capabilities,
|
|
336
|
-
title: "Choose capabilities",
|
|
339
|
+
title: tools_1.isBotNotificationEnabled() ? "Capabilities" : "Choose capabilities",
|
|
337
340
|
type: "multiSelect",
|
|
338
341
|
staticOptions: [],
|
|
339
342
|
default: [],
|
|
@@ -347,13 +350,30 @@ async function getQuestionsForAddCapability(ctx, inputs, func, envInfo, tokenPro
|
|
|
347
350
|
// For CLI_HELP
|
|
348
351
|
addCapQuestion.staticOptions = [
|
|
349
352
|
question_1.TabOptionItem,
|
|
350
|
-
question_1.BotOptionItem,
|
|
353
|
+
...(tools_1.isBotNotificationEnabled() ? [] : [question_1.BotOptionItem]),
|
|
351
354
|
...(tools_1.isBotNotificationEnabled() ? [question_1.NotificationOptionItem, question_1.CommandAndResponseOptionItem] : []),
|
|
352
355
|
question_1.MessageExtensionItem,
|
|
353
356
|
...(tools_1.isAadManifestEnabled() ? [question_1.TabNonSsoItem] : []),
|
|
354
|
-
question_1.TabSPFxItem,
|
|
355
357
|
];
|
|
356
|
-
|
|
358
|
+
const addCapNode = new teamsfx_api_1.QTreeNode(addCapQuestion);
|
|
359
|
+
if (tools_1.isBotNotificationEnabled()) {
|
|
360
|
+
// Hardcoded to call bot plugin to get notification trigger questions.
|
|
361
|
+
// Originally, v2 solution will not call getQuestionForUserTask of plugins on addCapability.
|
|
362
|
+
// V3 will not need this hardcoding.
|
|
363
|
+
const pluginMap = ResourcePluginContainer_1.getAllV2ResourcePluginMap();
|
|
364
|
+
const plugin = pluginMap.get(constants_2.PluginNames.BOT);
|
|
365
|
+
if (plugin && plugin.getQuestionsForUserTask) {
|
|
366
|
+
const result = await plugin.getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider);
|
|
367
|
+
if (result.isErr()) {
|
|
368
|
+
return result;
|
|
369
|
+
}
|
|
370
|
+
const botQuestionNode = result.value;
|
|
371
|
+
if (botQuestionNode) {
|
|
372
|
+
addCapNode.addChild(botQuestionNode);
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
return teamsfx_api_1.ok(addCapNode);
|
|
357
377
|
}
|
|
358
378
|
const canProceed = executeUserTask_1.canAddCapability(settings, ctx.telemetryReporter);
|
|
359
379
|
if (canProceed.isErr()) {
|
|
@@ -374,47 +394,55 @@ async function getQuestionsForAddCapability(ctx, inputs, func, envInfo, tokenPro
|
|
|
374
394
|
if (meExceedRes.isErr()) {
|
|
375
395
|
return teamsfx_api_1.err(meExceedRes.error);
|
|
376
396
|
}
|
|
377
|
-
|
|
397
|
+
// for the new bot, messaging extension and other bots are mutally exclusive
|
|
398
|
+
const isMEAddable = !meExceedRes.value && (!tools_1.isBotNotificationEnabled() || isBotAddable);
|
|
378
399
|
if (!(isTabAddable || isBotAddable || isMEAddable)) {
|
|
379
400
|
(_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.showMessage("error", localizeUtils_1.getLocalizedString("core.addCapability.exceedMaxLimit"), false);
|
|
380
401
|
return teamsfx_api_1.ok(undefined);
|
|
381
402
|
}
|
|
382
403
|
const options = [];
|
|
404
|
+
if (isBotAddable) {
|
|
405
|
+
if (tools_1.isBotNotificationEnabled()) {
|
|
406
|
+
options.push(question_1.CommandAndResponseOptionItem);
|
|
407
|
+
options.push(question_1.NotificationOptionItem);
|
|
408
|
+
}
|
|
409
|
+
else {
|
|
410
|
+
options.push(question_1.BotOptionItem);
|
|
411
|
+
}
|
|
412
|
+
}
|
|
383
413
|
if (isTabAddable) {
|
|
384
414
|
if (!tools_1.isAadManifestEnabled()) {
|
|
385
415
|
options.push(question_1.TabOptionItem);
|
|
386
416
|
}
|
|
387
417
|
else {
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
options.push(question_1.NotificationOptionItem);
|
|
395
|
-
options.push(question_1.CommandAndResponseOptionItem);
|
|
418
|
+
if (!(settings === null || settings === void 0 ? void 0 : settings.capabilities.includes(question_1.TabOptionItem.id))) {
|
|
419
|
+
options.push(question_1.TabNonSsoItem, question_1.TabOptionItem);
|
|
420
|
+
}
|
|
421
|
+
else {
|
|
422
|
+
options.push((settings === null || settings === void 0 ? void 0 : settings.capabilities.includes(question_1.TabSsoItem.id)) ? question_1.TabOptionItem : question_1.TabNonSsoItem);
|
|
423
|
+
}
|
|
396
424
|
}
|
|
397
425
|
}
|
|
398
426
|
if (isMEAddable)
|
|
399
427
|
options.push(question_1.MessageExtensionItem);
|
|
400
428
|
addCapQuestion.staticOptions = options;
|
|
401
429
|
const addCapNode = new teamsfx_api_1.QTreeNode(addCapQuestion);
|
|
402
|
-
// mini app can add SPFx tab
|
|
403
|
-
if (!settings) {
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
}
|
|
430
|
+
// // mini app can add SPFx tab
|
|
431
|
+
// if (!settings) {
|
|
432
|
+
// options.push(TabSPFxItem);
|
|
433
|
+
// const spfxPlugin = Container.get<v2.ResourcePlugin>(ResourcePluginsV2.SpfxPlugin);
|
|
434
|
+
// if (spfxPlugin && spfxPlugin.getQuestionsForScaffolding) {
|
|
435
|
+
// const result = await spfxPlugin.getQuestionsForScaffolding(ctx, inputs);
|
|
436
|
+
// if (result.isErr()) {
|
|
437
|
+
// return result;
|
|
438
|
+
// }
|
|
439
|
+
// const spfxQuestionNode = result.value;
|
|
440
|
+
// if (spfxQuestionNode) {
|
|
441
|
+
// spfxQuestionNode.condition = { contains: TabSPFxItem.id };
|
|
442
|
+
// addCapNode.addChild(spfxQuestionNode);
|
|
443
|
+
// }
|
|
444
|
+
// }
|
|
445
|
+
// }
|
|
418
446
|
if (tools_1.isBotNotificationEnabled()) {
|
|
419
447
|
// Hardcoded to call bot plugin to get notification trigger questions.
|
|
420
448
|
// Originally, v2 solution will not call getQuestionForUserTask of plugins on addCapability.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EAEP,aAAa,EACb,EAAE,EAEF,MAAM,EACN,IAAI,
|
|
1
|
+
{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EAEP,aAAa,EACb,EAAE,EAEF,MAAM,EACN,IAAI,EAML,MAAM,wBAAwB,CAAC;AAqChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6PhC"}
|
|
@@ -54,7 +54,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
54
54
|
teamsAppResource.tenantId = tenantIdInToken;
|
|
55
55
|
solutionConfig.teamsAppTenantId = tenantIdInToken;
|
|
56
56
|
}
|
|
57
|
-
if (utils_1.isAzureProject(azureSolutionSettings)) {
|
|
57
|
+
if (utils_1.isAzureProject(azureSolutionSettings) && projectSettingsHelper_1.hasAzureResource(ctx.projectSetting, true)) {
|
|
58
58
|
if (projectSettingsHelper_1.hasAAD(ctx.projectSetting)) {
|
|
59
59
|
if (ctx.permissionRequestProvider === undefined) {
|
|
60
60
|
ctx.permissionRequestProvider = new permissionRequest_1.PermissionRequestFileProvider(inputs.projectPath);
|
|
@@ -115,7 +115,9 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
115
115
|
solutionGlobalVars_1.solutionGlobalVars.TeamsAppId = teamsAppId;
|
|
116
116
|
solutionInputs.remoteTeamsAppId = teamsAppId;
|
|
117
117
|
// call deployArmTemplates
|
|
118
|
-
if (utils_1.isAzureProject(azureSolutionSettings) &&
|
|
118
|
+
if (utils_1.isAzureProject(azureSolutionSettings) &&
|
|
119
|
+
!inputs.isForUT &&
|
|
120
|
+
projectSettingsHelper_1.hasAzureResource(ctx.projectSetting, true)) {
|
|
119
121
|
const contextAdaptor = new adaptor_1.ProvisionContextAdapter([ctx, inputs, envInfo, tokenProvider]);
|
|
120
122
|
const armDeploymentResult = await arm_1.deployArmTemplates(contextAdaptor);
|
|
121
123
|
if (armDeploymentResult.isErr()) {
|
|
@@ -174,12 +176,23 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
|
|
|
174
176
|
const url = tools_1.getResourceGroupInPortal(solutionInputs.subscriptionId, solutionInputs.tenantId, solutionInputs.resourceGroupName);
|
|
175
177
|
if (url) {
|
|
176
178
|
const title = "View Provisioned Resources";
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
179
|
+
if (inputs.platform === teamsfx_api_1.Platform.CLI) {
|
|
180
|
+
ctx.userInteraction.showMessage("info", [
|
|
181
|
+
{
|
|
182
|
+
color: teamsfx_api_1.Colors.BRIGHT_WHITE,
|
|
183
|
+
content: msg + " View provisioned resources in Azure Portal: ",
|
|
184
|
+
},
|
|
185
|
+
{ color: teamsfx_api_1.Colors.BRIGHT_MAGENTA, content: url },
|
|
186
|
+
], false);
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
|
|
190
|
+
const userSelected = result.isOk() ? result.value : undefined;
|
|
191
|
+
if (userSelected === title) {
|
|
192
|
+
ctx.userInteraction.openUrl(url);
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
}
|
|
183
196
|
}
|
|
184
197
|
else {
|
|
185
198
|
ctx.userInteraction.showMessage("info", msg, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,wDAcgC;AAChC,oDAAoE;AACpE,yCAAiD;AACjD,mCAMiB;AACjB,4CAOsB;AACtB,yDAAwC;AACxC,4DAAiE;AACjE,uCAAoD;AACpD,gCAA4C;AAC5C,mCAAmC;AACnC,wEAA+D;AAC/D,0EAAmF;AACnF,qEAAkE;AAClE,+CAA4D;AAC5D,+CAA8F;AAC9F,sEAAmE;AACnE,iEAA8D;AAC9D,oFAIkD;AAClD,oEAAsE;AAE/D,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAA4B;;IAE5B,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAE5D,oBAAoB;IACpB,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,0BAAc,EAAE,yBAAa,CAAC,aAAa,EAAE,0BAA0B,CAAC,CACzF,CAAC;KACH;IACD,4EAA4E;IAC5E,sFAAsF;IACtF,4EAA4E;IAC5E,MAAM,aAAa,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAEpD,MAAM,SAAS,GAA6B,MAAkC,CAAC;IAC/E,MAAM,WAAW,GAAW,MAAM,CAAC,WAAW,CAAC;IAE/C,oBAAoB;IACpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,qCAAyB,CAAC,SAAS,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,qCAAyB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;IAC1D,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,qCAAyB,CAAC,SAAS,CAAC,CAAC;IAC5E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC;IACzD,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC9C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IACnD,MAAM,kBAAkB,GAAG,MAAM,2BAAe,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IAC/E,IAAI,kBAAkB,CAAC,KAAK,EAAE,EAAE;QAC9B,OAAO,iBAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;KACtC;IACD,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC;IACjD,IAAI,gBAAgB,IAAI,eAAe,IAAI,eAAe,KAAK,gBAAgB,EAAE;QAC/E,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,UAAU,EACV,yBAAa,CAAC,wBAAwB,EACtC,iFAAiF,OAAO,CAAC,OAAO,2EAA2E,CAC5K,CACF,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,EAAE;QACrB,gBAAgB,CAAC,QAAQ,GAAG,eAAe,CAAC;QAC5C,cAAc,CAAC,gBAAgB,GAAG,eAAe,CAAC;KACnD;IACD,IAAI,sBAAc,CAAC,qBAAqB,CAAC,IAAI,wCAAgB,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE;QACvF,IAAI,8BAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YAC9B,IAAI,GAAG,CAAC,yBAAyB,KAAK,SAAS,EAAE;gBAC/C,GAAG,CAAC,yBAAyB,GAAG,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;aACvF;YACD,MAAM,MAAM,GAAG,MAAM,+BAAuB,CAC1C,qBAAsB,EACtB,GAAG,CAAC,yBAAyB,CAC9B,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC1B;SACF;QACD,kDAAkD;QAClD,MAAM,iBAAiB,GAAG,MAAM,8BAAkB,CAChD,GAAG,EACH,SAAS,EACT,OAAuB,EACvB,aAAa,CACd,CAAC;QACF,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;SACrC;QAED,4BAA4B;QAC5B,MAAM,aAAa,GAAG,MAAM,kCAAsB,CAChD,GAAG,EACH,aAAa,CAAC,oBAAoB,EAClC,OAAuB,CACxB,CAAC;QACF,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,iBAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACjC;QAED,kCAAkC;QAClC,IAAI,cAAc,CAAC,uBAAuB,EAAE;YAC1C,MAAM,WAAW,GAAG,MAAM,yCAAmB,CAAC,sBAAsB,CAClE,cAAc,CAAC,iBAAiB,EAChC,aAAa,CAAC,oBAAoB,EAClC,cAAc,CAAC,cAAc,EAC7B,cAAc,CAAC,QAAQ,CACxB,CAAC;YACF,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE;gBACvB,OAAO,iBAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;aAC/B;SACF;KACF;IAED,MAAM,eAAe,GAAG,yCAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAE9D,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,GAAG,KAAK,CAAC;IACnE,MAAM,cAAc,GAAG,6BAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,CAAC;IAC3E,uEAAuE;IACvE,MAAM,OAAO,GAAG,eAAe;QAC7B,CAAC,CAAC,CAAC,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC,CAAC,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC3C,MAAM,eAAe,GAAG,OAAO;SAC5B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;SAC1D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,mBAAmB;YAC7B,KAAK,EAAE,GAAG,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;oBAC/B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;iBACjC;gBACD,oEAAoE;gBACpE,OAAO,MAAM,CAAC,iBAAkB,CAC9B,GAAG,gDACE,MAAM,GAAK,cAAc,KAAE,WAAW,EAAE,WAAW,KACxD,OAAO,EACP,aAAa,CACd,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,0BAA0B;IAC1B,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CACnB,kCAAkB,CAAC,4BAA4B,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAC7E,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,8BAAmB,CAAC,eAAe,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACpF,IAAI,eAAe,CAAC,IAAI,KAAK,SAAS,IAAI,eAAe,CAAC,IAAI,KAAK,gBAAgB,EAAE;QACnF,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;KACnC;IAED,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CACnB,kCAAkB,CAAC,sCAAsC,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CACvF,CAAC;IAEF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,uBAAW,CAAC,KAAK,CAAC,CAAC,qBAAS,CAAC,YAAY,CAAW,CAAC;IACtF,uCAAkB,CAAC,UAAU,GAAG,UAAU,CAAC;IAC3C,cAAc,CAAC,gBAAgB,GAAG,UAAU,CAAC;IAE7C,0BAA0B;IAC1B,IACE,sBAAc,CAAC,qBAAqB,CAAC;QACrC,CAAC,MAAM,CAAC,OAAO;QACf,wCAAgB,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,EAC1C;QACA,MAAM,cAAc,GAAG,IAAI,iCAAuB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;QAC1F,MAAM,mBAAmB,GAAG,MAAM,wBAAkB,CAAC,cAAc,CAAC,CAAC;QACrE,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;YAC/B,OAAO,iBAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;SACvC;QACD,mFAAmF;QACnF,MAAM,MAAM,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;QAChD,gBAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KACjC;IAED,gDAAgD;IAChD,IAAI,CAAC,eAAe,EAAE;QACpB,mCAAmC;QACnC,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,SAAS,CAAC,CAAC;QAChF,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,eAAe,EAAE;YACzF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,eAAe,CAC5C,GAAG,EACH,MAAM,EACN;gBACE,SAAS,EAAE,GAAG,uBAAW,CAAC,QAAQ,IAAI,uBAAW,CAAC,GAAG,EAAE;gBACvD,MAAM,EAAE,yBAAyB;gBACjC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;aAC3B,EACD,EAAE,EACF,OAAO,EACP,aAAa,CACd,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC1B;SACF;KACF;IAED,MAAM,uBAAuB,GAAG,OAAO;SACpC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;SAC1D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SACjC;QACD,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,mBAAmB;YAC7B,KAAK,EAAE,GAAG,EAAE;YACV,oEAAoE;YACpE,MAAM,CAAC,iBAAkB,CACvB,GAAG,gDACE,MAAM,GAAK,cAAc,KAAE,WAAW,EAAE,WAAW,KACxD,OAAO,EACP,aAAa,CACd;SACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,qBAAqB;IACrB,MAAM,uBAAuB,GAAG,MAAM,8BAAmB,CACvD,uBAAuB,EACvB,GAAG,CAAC,WAAW,CAChB,CAAC;IACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CACnB,kCAAkB,CAAC,0CAA0C,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAC3F,CAAC;IACF,IACE,uBAAuB,CAAC,IAAI,KAAK,SAAS;QAC1C,uBAAuB,CAAC,IAAI,KAAK,gBAAgB,EACjD;QACA,MAAM,GAAG,GAAG,kCAAkB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACxF,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,cAAc,CAAC,wCAA4B,CAAC,GAAG,KAAK,CAAC;QACrD,OAAO,iBAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;KAC3C;SAAM;QACL,IAAI,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,+BAAmB,CAAC,EAAE;YACrF,OAAO,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,+BAAmB,CAAC,CAAC;SAC1D;QAED,MAAM,GAAG,GAAG,kCAAkB,CAAC,8BAA8B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC3F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,eAAe,EAAE;YACpB,MAAM,GAAG,GAAG,gCAAwB,CAClC,cAAc,CAAC,cAAc,EAC7B,cAAc,CAAC,QAAQ,EACvB,cAAc,CAAC,iBAAiB,CACjC,CAAC;YACF,IAAI,GAAG,EAAE;gBACP,MAAM,KAAK,GAAG,4BAA4B,CAAC;gBAC3C,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;oBACpC,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN;wBACE;4BACE,KAAK,EAAE,oBAAM,CAAC,YAAY;4BAC1B,OAAO,EAAE,GAAG,GAAG,+CAA+C;yBAC/D;wBACD,EAAE,KAAK,EAAE,oBAAM,CAAC,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE;qBAC/C,EACD,KAAK,CACN,CAAC;iBACH;qBAAM;oBACL,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;wBACzE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC9D,IAAI,YAAY,KAAK,KAAK,EAAE;4BAC1B,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;yBAClC;oBACH,CAAC,CAAC,CAAC;iBACJ;aACF;iBAAM;gBACL,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;aACrD;SACF;aAAM;YACL,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;SACrD;QACD,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,GAAG,IAAI,CAAC;QAClE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;AACH,CAAC;AAlQD,8CAkQC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EACJ,yBAAyB,EACzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EACJ,yBAAyB,EACzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;AA+BhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAExF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAE3F;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAKpF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,GACrB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiFvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}
|
|
@@ -122,7 +122,7 @@ function fillInSolutionSettings(projectSettings, answers) {
|
|
|
122
122
|
let capabilities = answers[question_1.AzureSolutionQuestionNames.Capabilities] || [];
|
|
123
123
|
if (tools_1.isAadManifestEnabled()) {
|
|
124
124
|
if (capabilities.includes(question_1.TabOptionItem.id)) {
|
|
125
|
-
capabilities.push(question_1.
|
|
125
|
+
capabilities.push(question_1.TabSsoItem.id);
|
|
126
126
|
}
|
|
127
127
|
else if (capabilities.includes(question_1.TabNonSsoItem.id)) {
|
|
128
128
|
const index = capabilities.indexOf(question_1.TabNonSsoItem.id);
|
|
@@ -163,6 +163,14 @@ function fillInSolutionSettings(projectSettings, answers) {
|
|
|
163
163
|
capabilities = [question_1.TabOptionItem.id];
|
|
164
164
|
hostType = question_1.HostTypeOptionSPFx.id;
|
|
165
165
|
}
|
|
166
|
+
else if (capabilities.includes(question_1.M365SsoLaunchPageOptionItem.id)) {
|
|
167
|
+
capabilities = [question_1.TabOptionItem.id];
|
|
168
|
+
hostType = question_1.HostTypeOptionAzure.id;
|
|
169
|
+
}
|
|
170
|
+
else if (capabilities.includes(question_1.M365SearchAppOptionItem.id)) {
|
|
171
|
+
capabilities = [question_1.MessageExtensionItem.id];
|
|
172
|
+
hostType = question_1.HostTypeOptionAzure.id;
|
|
173
|
+
}
|
|
166
174
|
if (!hostType) {
|
|
167
175
|
return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_1.SolutionSource, constants_1.SolutionError.InternelError, "hostType is undefined"));
|
|
168
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;AAAA,wDAiBgC;AAChC,sFAAsF;AACtF,oDAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "1.7.0",
|
|
3
|
+
"version": "1.7.1-alpha.266fa3b9f.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -48,7 +48,8 @@
|
|
|
48
48
|
"check-sensitive": "npx eslint --plugin 'no-secrets' --cache --ignore-pattern 'package.json' --ignore-pattern 'package-lock.json'",
|
|
49
49
|
"precommit": "npm run check-sensitive && lint-staged",
|
|
50
50
|
"install:tabs": "cd tabs && npm install",
|
|
51
|
-
"installAll": "npm run install:tabs"
|
|
51
|
+
"installAll": "npm run install:tabs",
|
|
52
|
+
"version": "bash ../../.github/scripts/pkg-version.sh api-connector-sync"
|
|
52
53
|
},
|
|
53
54
|
"dependencies": {
|
|
54
55
|
"@apidevtools/swagger-parser": "^10.0.2",
|
|
@@ -64,7 +65,7 @@
|
|
|
64
65
|
"@azure/storage-blob": "^12.7.0",
|
|
65
66
|
"@dbpiper/timer": "1.0.0-beta.2",
|
|
66
67
|
"@feathersjs/hooks": "^0.6.5",
|
|
67
|
-
"@microsoft/teamsfx-api": "
|
|
68
|
+
"@microsoft/teamsfx-api": "0.17.3-alpha.266fa3b9f.0",
|
|
68
69
|
"@npmcli/arborist": "^4.2.0",
|
|
69
70
|
"@types/jwt-decode": "3.1.0",
|
|
70
71
|
"@types/proper-lockfile": "^4.1.1",
|
|
@@ -183,7 +184,7 @@
|
|
|
183
184
|
"resource/**/*",
|
|
184
185
|
"templates/**/*"
|
|
185
186
|
],
|
|
186
|
-
"gitHead": "
|
|
187
|
+
"gitHead": "f1ad4898745eaac4ac1542b0589db94d1b60659c",
|
|
187
188
|
"publishConfig": {
|
|
188
189
|
"access": "public"
|
|
189
190
|
},
|