@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.8d048e1f1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +1 -1
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -1
- package/build/common/constants.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +1 -1
- package/build/common/projectSettingsHelper.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 +1 -1
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +6 -5
- package/build/common/tools.js.map +1 -1
- package/build/core/FxCore.d.ts +2 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +49 -11
- 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 +211 -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 -2
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/question.d.ts +3 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +22 -2
- package/build/core/question.js.map +1 -1
- package/build/plugins/resource/aad/plugin.d.ts +1 -0
- package/build/plugins/resource/aad/plugin.d.ts.map +1 -1
- package/build/plugins/resource/aad/plugin.js +54 -1
- package/build/plugins/resource/aad/plugin.js.map +1 -1
- package/build/plugins/resource/aad/utils/configs.d.ts.map +1 -1
- package/build/plugins/resource/aad/utils/configs.js +4 -1
- package/build/plugins/resource/aad/utils/configs.js.map +1 -1
- package/build/plugins/resource/apiconnector/checker.d.ts +2 -0
- package/build/plugins/resource/apiconnector/checker.d.ts.map +1 -0
- package/build/plugins/resource/apiconnector/checker.js +22 -0
- package/build/plugins/resource/apiconnector/checker.js.map +1 -0
- package/build/plugins/resource/apiconnector/config.d.ts +20 -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 +15 -0
- package/build/plugins/resource/apiconnector/constants.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/constants.js +17 -1
- 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 +2 -2
- package/build/plugins/resource/apiconnector/envHandler.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/envHandler.js +18 -24
- 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 +11 -2
- package/build/plugins/resource/apiconnector/plugin.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/plugin.js +179 -17
- package/build/plugins/resource/apiconnector/plugin.js.map +1 -1
- package/build/plugins/resource/apiconnector/questions.d.ts +23 -3
- package/build/plugins/resource/apiconnector/questions.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/questions.js +69 -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/utils.d.ts +16 -20
- package/build/plugins/resource/apiconnector/utils.d.ts.map +1 -1
- package/build/plugins/resource/apiconnector/utils.js +72 -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/manifestTemplate.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/manifestTemplate.js +3 -3
- 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.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/constants.d.ts +0 -8
- package/build/plugins/resource/bot/constants.d.ts.map +1 -1
- package/build/plugins/resource/bot/constants.js +0 -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/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/frontend/resources/templateInfo.js +1 -1
- package/build/plugins/resource/frontend/resources/templateInfo.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/constants.d.ts +16 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +19 -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 +3 -1
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +21 -7
- 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 +121 -82
- 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 +31 -22
- 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 +17 -6
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js +1 -1
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +91 -39
- package/resource/unify-config-change-logs.md +15 -0
- package/templates/core/README.md +1 -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.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.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/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/bot-msgext.js.default.zip +0 -0
- package/templates/fallback/bot-msgext.ts.default.zip +0 -0
- package/templates/fallback/msgext.js.default.zip +0 -0
- package/templates/fallback/msgext.ts.default.zip +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aadManifestMigration.js","sourceRoot":"","sources":["../../../src/core/middleware/aadManifestMigration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { Middleware } from "@feathersjs/hooks/lib";
|
|
2
|
+
import { CoreHookContext } from "../types";
|
|
2
3
|
export declare const ProjectConsolidateMW: Middleware;
|
|
4
|
+
export declare function needConsolidateLocalRemote(ctx: CoreHookContext): Promise<boolean>;
|
|
3
5
|
//# sourceMappingURL=consolidateLocalRemote.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidateLocalRemote.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"consolidateLocalRemote.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAYjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgB3C,eAAO,MAAM,oBAAoB,EAAE,UAoBlC,CAAC;AAoCF,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAuBvF"}
|
|
@@ -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.ProjectConsolidateMW = void 0;
|
|
5
|
+
exports.needConsolidateLocalRemote = exports.ProjectConsolidateMW = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
8
|
const tools_1 = require("../../common/tools");
|
|
@@ -10,7 +10,6 @@ const environment_1 = require("../environment");
|
|
|
10
10
|
const error_1 = require("../error");
|
|
11
11
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
12
12
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
13
|
-
const constants_1 = require("../../plugins/resource/appstudio/constants");
|
|
14
13
|
const utils_1 = require("../../plugins/resource/appstudio/utils/utils");
|
|
15
14
|
const telemetry_1 = require("../../common/telemetry");
|
|
16
15
|
const globalVars_1 = require("../globalVars");
|
|
@@ -20,36 +19,27 @@ const folder_1 = require("../../folder");
|
|
|
20
19
|
const projectSettingsLoader_1 = require("./projectSettingsLoader");
|
|
21
20
|
const projectMigrator_1 = require("./projectMigrator");
|
|
22
21
|
const util = tslib_1.__importStar(require("util"));
|
|
23
|
-
const
|
|
22
|
+
const constants_1 = require("../../plugins/resource/spfx/utils/constants");
|
|
24
23
|
const upgradeButton = "Upgrade";
|
|
25
24
|
let userCancelFlag = false;
|
|
26
25
|
const backupFolder = ".backup";
|
|
26
|
+
const methods = new Set(["getProjectConfig", "checkPermission"]);
|
|
27
|
+
const upgradeReportName = "unify-config-change-logs.md";
|
|
27
28
|
const ProjectConsolidateMW = async (ctx, next) => {
|
|
28
29
|
if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
|
|
29
30
|
next();
|
|
30
31
|
}
|
|
31
32
|
else if ((await needConsolidateLocalRemote(ctx)) && checkMethod(ctx)) {
|
|
32
33
|
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
|
|
37
|
-
[telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
|
|
38
|
-
});
|
|
39
|
-
ctx.result = teamsfx_api_1.err(error_1.ConsolidateCanceledError());
|
|
40
|
-
outputCancelMessage(ctx);
|
|
41
|
-
return;
|
|
34
|
+
let showModal = true;
|
|
35
|
+
if (ctx.method && methods.has(ctx.method)) {
|
|
36
|
+
showModal = false;
|
|
42
37
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
});
|
|
46
|
-
try {
|
|
47
|
-
await consolidateLocalRemote(ctx);
|
|
48
|
-
await next();
|
|
38
|
+
if (showModal) {
|
|
39
|
+
await upgrade(ctx, next, true);
|
|
49
40
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
throw error;
|
|
41
|
+
else {
|
|
42
|
+
upgrade(ctx, next, false);
|
|
53
43
|
}
|
|
54
44
|
}
|
|
55
45
|
else {
|
|
@@ -57,6 +47,29 @@ const ProjectConsolidateMW = async (ctx, next) => {
|
|
|
57
47
|
}
|
|
58
48
|
};
|
|
59
49
|
exports.ProjectConsolidateMW = ProjectConsolidateMW;
|
|
50
|
+
async function upgrade(ctx, next, showModal) {
|
|
51
|
+
const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.Message"), showModal, upgradeButton));
|
|
52
|
+
const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
|
|
53
|
+
if (!answer || answer != upgradeButton) {
|
|
54
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
|
|
55
|
+
[telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.Cancel,
|
|
56
|
+
});
|
|
57
|
+
ctx.result = teamsfx_api_1.err(error_1.ConsolidateCanceledError());
|
|
58
|
+
outputCancelMessage(ctx);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateNotification, {
|
|
62
|
+
[telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorStatus.OK,
|
|
63
|
+
});
|
|
64
|
+
try {
|
|
65
|
+
await consolidateLocalRemote(ctx);
|
|
66
|
+
await next();
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
|
|
70
|
+
throw error;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
60
73
|
// check if config.local.json and manifest.template.json exist
|
|
61
74
|
async function needConsolidateLocalRemote(ctx) {
|
|
62
75
|
if (!tools_1.isConfigUnifyEnabled()) {
|
|
@@ -77,6 +90,7 @@ async function needConsolidateLocalRemote(ctx) {
|
|
|
77
90
|
}
|
|
78
91
|
return false;
|
|
79
92
|
}
|
|
93
|
+
exports.needConsolidateLocalRemote = needConsolidateLocalRemote;
|
|
80
94
|
function outputCancelMessage(ctx) {
|
|
81
95
|
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade cancelled.`);
|
|
82
96
|
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
@@ -92,6 +106,7 @@ async function consolidateLocalRemote(ctx) {
|
|
|
92
106
|
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgradeStart);
|
|
93
107
|
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
94
108
|
const fileList = [];
|
|
109
|
+
const removeMap = new Map();
|
|
95
110
|
const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs, true);
|
|
96
111
|
if (loadRes.isErr()) {
|
|
97
112
|
ctx.result = teamsfx_api_1.err(loadRes.error);
|
|
@@ -111,8 +126,6 @@ async function consolidateLocalRemote(ctx) {
|
|
|
111
126
|
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateAddLocalEnv);
|
|
112
127
|
// add consolidate manifest
|
|
113
128
|
let manifest;
|
|
114
|
-
const templatesFolder = folder_1.getTemplatesFolder();
|
|
115
|
-
const appDir = `${ctx.root}/${constants_1.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}`;
|
|
116
129
|
const remoteManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.remote.template.json");
|
|
117
130
|
const remoteManifestExist = await fs_extra_1.default.pathExists(remoteManifestFile);
|
|
118
131
|
if (remoteManifestExist) {
|
|
@@ -125,13 +138,13 @@ async function consolidateLocalRemote(ctx) {
|
|
|
125
138
|
if ((manifest === null || manifest === void 0 ? void 0 : manifest.staticTabs) && manifest.staticTabs.length > 0) {
|
|
126
139
|
manifest.staticTabs.forEach((item) => {
|
|
127
140
|
componentId = item.entityId;
|
|
128
|
-
const contentUrl = util.format(
|
|
141
|
+
const contentUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
|
|
129
142
|
item.contentUrl = contentUrl;
|
|
130
143
|
});
|
|
131
144
|
}
|
|
132
145
|
if ((manifest === null || manifest === void 0 ? void 0 : manifest.configurableTabs) && manifest.configurableTabs.length > 0) {
|
|
133
146
|
manifest.configurableTabs.forEach((item) => {
|
|
134
|
-
const configurationUrl = util.format(
|
|
147
|
+
const configurationUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
|
|
135
148
|
item.configurationUrl = configurationUrl;
|
|
136
149
|
});
|
|
137
150
|
}
|
|
@@ -146,35 +159,44 @@ async function consolidateLocalRemote(ctx) {
|
|
|
146
159
|
}
|
|
147
160
|
}
|
|
148
161
|
fileList.push(path_1.default.join(inputs.projectPath, "templates", "appPackage", "template.manifest.json"));
|
|
162
|
+
// copy and remove old configs
|
|
163
|
+
const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
|
|
164
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfigStart);
|
|
165
|
+
const localSettingsFile = path_1.default.join(inputs.projectPath, ".fx", "configs", "localSettings.json");
|
|
166
|
+
if (await fs_extra_1.default.pathExists(localSettingsFile)) {
|
|
167
|
+
await fs_extra_1.default.copy(localSettingsFile, path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), { overwrite: true });
|
|
168
|
+
await fs_extra_1.default.remove(localSettingsFile);
|
|
169
|
+
removeMap.set(path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), localSettingsFile);
|
|
170
|
+
}
|
|
171
|
+
const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
|
|
172
|
+
if (await fs_extra_1.default.pathExists(localManifestFile)) {
|
|
173
|
+
await fs_extra_1.default.copy(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
|
|
174
|
+
await fs_extra_1.default.remove(localManifestFile);
|
|
175
|
+
removeMap.set(path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), localManifestFile);
|
|
176
|
+
}
|
|
177
|
+
if (await fs_extra_1.default.pathExists(remoteManifestFile)) {
|
|
178
|
+
await fs_extra_1.default.copy(remoteManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), { overwrite: true });
|
|
179
|
+
await fs_extra_1.default.remove(remoteManifestFile);
|
|
180
|
+
removeMap.set(path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), remoteManifestFile);
|
|
181
|
+
}
|
|
182
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfig);
|
|
183
|
+
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgrade);
|
|
184
|
+
postConsolidate(inputs.projectPath, ctx, inputs, backupFolder);
|
|
149
185
|
}
|
|
150
186
|
catch (e) {
|
|
187
|
+
for (const item of removeMap.entries()) {
|
|
188
|
+
await fs_extra_1.default.copy(item[0], item[1]);
|
|
189
|
+
}
|
|
151
190
|
for (const item of fileList) {
|
|
152
191
|
await fs_extra_1.default.remove(item);
|
|
153
192
|
}
|
|
193
|
+
await fs_extra_1.default.remove(path_1.default.join(inputs.projectPath, backupFolder));
|
|
154
194
|
throw e;
|
|
155
195
|
}
|
|
156
|
-
|
|
157
|
-
const backupPath = path_1.default.join(inputs.projectPath, backupFolder);
|
|
158
|
-
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfigStart);
|
|
159
|
-
const localSettingsFile = path_1.default.join(inputs.projectPath, ".fx", "configs", "localSettings.json");
|
|
160
|
-
if (await fs_extra_1.default.pathExists(localSettingsFile)) {
|
|
161
|
-
await fs_extra_1.default.move(localSettingsFile, path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), { overwrite: true });
|
|
162
|
-
}
|
|
163
|
-
const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
|
|
164
|
-
if (await fs_extra_1.default.pathExists(localManifestFile)) {
|
|
165
|
-
await fs_extra_1.default.move(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
|
|
166
|
-
}
|
|
167
|
-
const remoteManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.remote.template.json");
|
|
168
|
-
if (await fs_extra_1.default.pathExists(remoteManifestFile)) {
|
|
169
|
-
await fs_extra_1.default.move(remoteManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.remote.template.json"), { overwrite: true });
|
|
170
|
-
}
|
|
171
|
-
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateBackupConfig);
|
|
172
|
-
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgrade);
|
|
173
|
-
postConsolidate(inputs.projectPath, ctx, inputs, backupFolder);
|
|
196
|
+
generateUpgradeReport(path_1.default.join(inputs.projectPath, backupFolder));
|
|
174
197
|
return true;
|
|
175
198
|
}
|
|
176
199
|
function checkMethod(ctx) {
|
|
177
|
-
const methods = new Set(["getProjectConfig", "checkPermission"]);
|
|
178
200
|
if (ctx.method && methods.has(ctx.method) && userCancelFlag)
|
|
179
201
|
return false;
|
|
180
202
|
userCancelFlag = ctx.method != undefined && methods.has(ctx.method);
|
|
@@ -184,20 +206,27 @@ async function postConsolidate(projectPath, ctx, inputs, backupFolder) {
|
|
|
184
206
|
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateGuideStart);
|
|
185
207
|
await updateGitIgnore(projectPath, globalVars_1.TOOLS.logProvider, backupFolder);
|
|
186
208
|
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade success! Old localSettings.json, manifest.local.template.json and manifest.remote.template.json have been backed up to the .backup folder and you can delete it.`);
|
|
187
|
-
if (inputs.platform
|
|
188
|
-
await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.outputMsg"), false, "OK"));
|
|
189
|
-
}
|
|
190
|
-
else {
|
|
209
|
+
if (inputs.platform !== teamsfx_api_1.Platform.VSCode) {
|
|
191
210
|
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.info(localizeUtils_1.getLocalizedString("core.consolidateLocalRemote.SuccessMessage"));
|
|
192
211
|
}
|
|
193
212
|
}
|
|
194
213
|
async function updateGitIgnore(projectPath, log, backupFolder) {
|
|
195
214
|
// add config.local.json to .gitignore
|
|
196
|
-
await projectMigrator_1.addPathToGitignore(projectPath,
|
|
215
|
+
await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/config.local.json`, log);
|
|
197
216
|
// add state.local.json to .gitignore
|
|
198
|
-
await projectMigrator_1.addPathToGitignore(projectPath,
|
|
217
|
+
await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.StatesFolderName}/state.local.json`, log);
|
|
199
218
|
if (backupFolder) {
|
|
200
|
-
await projectMigrator_1.addPathToGitignore(projectPath, backupFolder
|
|
219
|
+
await projectMigrator_1.addPathToGitignore(projectPath, `${projectPath}/${backupFolder}`, log);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
async function generateUpgradeReport(backupFolder) {
|
|
223
|
+
try {
|
|
224
|
+
const target = path_1.default.join(backupFolder, upgradeReportName);
|
|
225
|
+
const source = path_1.default.resolve(path_1.default.join(folder_1.getResourceFolder(), upgradeReportName));
|
|
226
|
+
await fs_extra_1.default.copyFile(source, target);
|
|
227
|
+
}
|
|
228
|
+
catch (error) {
|
|
229
|
+
// do nothing
|
|
201
230
|
}
|
|
202
231
|
}
|
|
203
232
|
//# sourceMappingURL=consolidateLocalRemote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAGL,IAAI,EACJ,cAAc,EACd,OAAO,EACP,MAAM,EAGN,SAAS,EACT,MAAM,EACN,QAAQ,EACR,eAAe,EACf,KAAK,EAGL,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -326,9 +326,18 @@ async function getQuestionsForCreateProjectV2(inputs) {
|
|
|
326
326
|
}
|
|
327
327
|
// Language
|
|
328
328
|
const programmingLanguage = new teamsfx_api_1.QTreeNode(question_2.ProgrammingLanguageQuestion);
|
|
329
|
-
programmingLanguage.condition = {
|
|
330
|
-
|
|
329
|
+
programmingLanguage.condition = {
|
|
330
|
+
minItems: 1,
|
|
331
|
+
excludes: question_1.ExistingTabOptionItem.id,
|
|
332
|
+
};
|
|
333
|
+
capNode.addChild(programmingLanguage);
|
|
331
334
|
createNewM365.addChild(programmingLanguage);
|
|
335
|
+
// existing tab endpoint
|
|
336
|
+
const existingTabEndpoint = new teamsfx_api_1.QTreeNode(question_2.ExistingTabEndpointQuestion);
|
|
337
|
+
existingTabEndpoint.condition = {
|
|
338
|
+
contains: question_1.ExistingTabOptionItem.id,
|
|
339
|
+
};
|
|
340
|
+
capNode.addChild(existingTabEndpoint);
|
|
332
341
|
// only CLI need folder input
|
|
333
342
|
if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform)) {
|
|
334
343
|
createNew.addChild(new teamsfx_api_1.QTreeNode(question_2.QuestionRootFolder));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionModel.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"questionModel.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}
|
package/build/core/question.d.ts
CHANGED
|
@@ -19,7 +19,8 @@ export declare enum CoreQuestionNames {
|
|
|
19
19
|
NewTargetEnvName = "newTargetEnvName",
|
|
20
20
|
M365CreateFromScratch = "m365-scratch",
|
|
21
21
|
M365AppType = "app-type",
|
|
22
|
-
M365Capabilities = "m365-capabilities"
|
|
22
|
+
M365Capabilities = "m365-capabilities",
|
|
23
|
+
ExistingTabEndpoint = "existing-tab-endpoint"
|
|
23
24
|
}
|
|
24
25
|
export declare const ProjectNamePattern = "^[a-zA-Z][\\da-zA-Z]+$";
|
|
25
26
|
export declare function createAppNameQuestion(validateProjectPathExistence?: boolean): TextInputQuestion;
|
|
@@ -48,4 +49,5 @@ export declare const SampleSelect: SingleSelectQuestion;
|
|
|
48
49
|
export declare const M365CreateFromScratchSelectQuestion: SingleSelectQuestion;
|
|
49
50
|
export declare const M365AppTypeSelectQuestion: SingleSelectQuestion;
|
|
50
51
|
export declare const M365CapabilitiesFuncQuestion: FuncQuestion;
|
|
52
|
+
export declare const ExistingTabEndpointQuestion: TextInputQuestion;
|
|
51
53
|
//# sourceMappingURL=question.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EAIZ,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"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"}
|
package/build/core/question.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.M365CapabilitiesFuncQuestion = exports.M365AppTypeSelectQuestion = exports.M365CreateFromScratchSelectQuestion = exports.SampleSelect = exports.getCreateNewOrFromSampleQuestion = exports.ScratchOptionNo = exports.ScratchOptionYesM365 = exports.ScratchOptionYes = exports.ScratchOptionNoVSC = exports.ScratchOptionYesM365VSC = exports.ScratchOptionYesVSC = exports.QuestionNewResourceGroupLocation = exports.QuestionNewResourceGroupName = exports.QuestionSelectResourceGroup = exports.QuestionSelectSourceEnvironment = exports.getQuestionNewTargetEnvironmentName = exports.QuestionSelectTargetEnvironment = exports.onChangeSelectionForCapabilities = exports.validateCapabilities = exports.createCapabilityQuestion = exports.validateConflict = exports.handleSelectionConflict = exports.ProgrammingLanguageQuestion = exports.QuestionRootFolder = exports.DefaultAppNameFunc = exports.createAppNameQuestion = exports.ProjectNamePattern = exports.CoreQuestionNames = void 0;
|
|
3
|
+
exports.ExistingTabEndpointQuestion = exports.M365CapabilitiesFuncQuestion = exports.M365AppTypeSelectQuestion = exports.M365CreateFromScratchSelectQuestion = exports.SampleSelect = exports.getCreateNewOrFromSampleQuestion = exports.ScratchOptionNo = exports.ScratchOptionYesM365 = exports.ScratchOptionYes = exports.ScratchOptionNoVSC = exports.ScratchOptionYesM365VSC = exports.ScratchOptionYesVSC = exports.QuestionNewResourceGroupLocation = exports.QuestionNewResourceGroupName = exports.QuestionSelectResourceGroup = exports.QuestionSelectSourceEnvironment = exports.getQuestionNewTargetEnvironmentName = exports.QuestionSelectTargetEnvironment = exports.onChangeSelectionForCapabilities = exports.validateCapabilities = exports.createCapabilityQuestion = exports.validateConflict = exports.handleSelectionConflict = exports.ProgrammingLanguageQuestion = exports.QuestionRootFolder = exports.DefaultAppNameFunc = exports.createAppNameQuestion = exports.ProjectNamePattern = exports.CoreQuestionNames = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -36,6 +36,7 @@ var CoreQuestionNames;
|
|
|
36
36
|
CoreQuestionNames["M365CreateFromScratch"] = "m365-scratch";
|
|
37
37
|
CoreQuestionNames["M365AppType"] = "app-type";
|
|
38
38
|
CoreQuestionNames["M365Capabilities"] = "m365-capabilities";
|
|
39
|
+
CoreQuestionNames["ExistingTabEndpoint"] = "existing-tab-endpoint";
|
|
39
40
|
})(CoreQuestionNames = exports.CoreQuestionNames || (exports.CoreQuestionNames = {}));
|
|
40
41
|
exports.ProjectNamePattern = "^[a-zA-Z][\\da-zA-Z]+$";
|
|
41
42
|
function createAppNameQuestion(validateProjectPathExistence = true) {
|
|
@@ -184,10 +185,12 @@ function createCapabilityQuestion() {
|
|
|
184
185
|
title: localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.title"),
|
|
185
186
|
type: "multiSelect",
|
|
186
187
|
staticOptions: [
|
|
187
|
-
...[question_1.TabOptionItem
|
|
188
|
+
...[question_1.TabOptionItem],
|
|
189
|
+
...(tools_1.isBotNotificationEnabled() ? [] : [question_1.BotOptionItem]),
|
|
188
190
|
...(tools_1.isBotNotificationEnabled() ? [question_1.NotificationOptionItem, question_1.CommandAndResponseOptionItem] : []),
|
|
189
191
|
...[question_1.MessageExtensionItem, question_1.TabSPFxItem],
|
|
190
192
|
...(tools_1.isAadManifestEnabled() ? [question_1.TabNonSsoItem] : []),
|
|
193
|
+
...(tools_1.isExistingTabAppEnabled() ? [question_1.ExistingTabOptionItem] : []),
|
|
191
194
|
],
|
|
192
195
|
default: [question_1.TabOptionItem.id],
|
|
193
196
|
placeholder: localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.placeholder"),
|
|
@@ -244,6 +247,7 @@ async function onChangeSelectionForCapabilities(currentSelectedIds, previousSele
|
|
|
244
247
|
question_1.CommandAndResponseOptionItem.id,
|
|
245
248
|
]),
|
|
246
249
|
new Set([question_1.TabSPFxItem.id]),
|
|
250
|
+
new Set([question_1.ExistingTabOptionItem.id]),
|
|
247
251
|
], previousSelectedIds, result);
|
|
248
252
|
result = handleSelectionConflict([new Set([question_1.TabOptionItem.id]), new Set([question_1.TabNonSsoItem.id])], previousSelectedIds, result);
|
|
249
253
|
return result;
|
|
@@ -432,4 +436,20 @@ exports.M365CapabilitiesFuncQuestion = {
|
|
|
432
436
|
}
|
|
433
437
|
},
|
|
434
438
|
};
|
|
439
|
+
exports.ExistingTabEndpointQuestion = {
|
|
440
|
+
type: "text",
|
|
441
|
+
name: CoreQuestionNames.ExistingTabEndpoint,
|
|
442
|
+
title: localizeUtils_1.getLocalizedString("core.ExistingTabEndpointQuestion.title"),
|
|
443
|
+
default: "https://localhost:3000",
|
|
444
|
+
placeholder: localizeUtils_1.getLocalizedString("core.ExistingTabEndpointQuestion.placeholder"),
|
|
445
|
+
validation: {
|
|
446
|
+
validFunc: async (endpoint) => {
|
|
447
|
+
const match = endpoint.match(/^https:\/\/[\S]+$/i);
|
|
448
|
+
if (!match) {
|
|
449
|
+
return localizeUtils_1.getLocalizedString("core.ExistingTabEndpointQuestion.validation");
|
|
450
|
+
}
|
|
451
|
+
return undefined;
|
|
452
|
+
},
|
|
453
|
+
},
|
|
454
|
+
};
|
|
435
455
|
//# sourceMappingURL=question.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"question.js","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"question.js","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export declare class AadAppForTeamsImpl {
|
|
|
19
19
|
static parsePermission(permissionRequest: string, logProvider?: LogProvider): RequiredResourceAccess[];
|
|
20
20
|
private static generateRequiredResourceAccess;
|
|
21
21
|
scaffold(ctx: PluginContext): Promise<AadResult>;
|
|
22
|
+
private isRedirectUrlExist;
|
|
22
23
|
deploy(ctx: PluginContext): Promise<Result<any, FxError>>;
|
|
23
24
|
private writeManifestFileToBuildFolder;
|
|
24
25
|
private validateDeployManifest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,OAAO,EACP,WAAW,EACX,aAAa,EACb,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAiB,MAAM,WAAW,CAAC;AAuCrD,OAAO,EACL,cAAc,EACd,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAMnE,qBAAa,kBAAkB;IAChB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAsFvE,sBAAsB,CACjC,GAAG,EAAE,aAAa,EAClB,YAAY,UAAQ,GACnB,OAAO,CAAC,SAAS,CAAC;IAsEd,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,SAAS;IAkBtE,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA4D3E,0BAA0B,CACrC,GAAG,EAAE,aAAa,EAClB,YAAY,UAAQ,GACnB,OAAO,CAAC,SAAS,CAAC;IA2CR,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAwCxD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAqB5D,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA8BpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAyB1E,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,SAAS,GAClB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;WA0BnC,eAAe,CAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,QAAQ,EAAE,MAAM;mBAyBG,0BAA0B;WA8CjC,eAAe,CAC3B,iBAAiB,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,sBAAsB,EAAE;IA6B3B,OAAO,CAAC,MAAM,CAAC,8BAA8B;IAyHhC,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IA8E7D,OAAO,CAAC,kBAAkB;IAOb,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YA8BxD,8BAA8B;IAU5C,OAAO,CAAC,sBAAsB;CA0B/B"}
|