@microsoft/teamsfx-core 1.4.1-alpha.b2569834.0 → 1.5.0-rc.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/local/constants.d.ts +0 -4
- package/build/common/local/constants.d.ts.map +1 -1
- package/build/common/local/constants.js +1 -5
- package/build/common/local/constants.js.map +1 -1
- package/build/common/local/portChecker.d.ts.map +1 -1
- package/build/common/local/portChecker.js +1 -8
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/local/projectSettingsHelper.d.ts +0 -1
- package/build/common/local/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/local/projectSettingsHelper.js +2 -5
- package/build/common/local/projectSettingsHelper.js.map +1 -1
- package/build/common/localSettingsProvider.d.ts +3 -3
- package/build/common/localSettingsProvider.d.ts.map +1 -1
- package/build/common/localSettingsProvider.js +11 -5
- package/build/common/localSettingsProvider.js.map +1 -1
- package/build/common/projectSettingsValidator.d.ts.map +1 -1
- package/build/common/projectSettingsValidator.js +4 -0
- package/build/common/projectSettingsValidator.js.map +1 -1
- package/build/common/samples-config.json +12 -2
- package/build/common/templates-config.json +2 -2
- package/build/common/tools.d.ts +0 -4
- package/build/common/tools.d.ts.map +1 -1
- package/build/common/tools.js +1 -4
- package/build/common/tools.js.map +1 -1
- package/build/core/error.d.ts +0 -6
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +1 -25
- package/build/core/error.js.map +1 -1
- package/build/core/index.d.ts +3 -5
- package/build/core/index.d.ts.map +1 -1
- package/build/core/index.js +37 -130
- package/build/core/index.js.map +1 -1
- package/build/core/middleware/CommonErrorHandlerMW.d.ts.map +1 -1
- package/build/core/middleware/CommonErrorHandlerMW.js +7 -2
- package/build/core/middleware/CommonErrorHandlerMW.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +1 -2
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.d.ts +2 -0
- package/build/core/middleware/envInfoLoaderV3.d.ts.map +1 -1
- package/build/core/middleware/envInfoLoaderV3.js +2 -1
- package/build/core/middleware/envInfoLoaderV3.js.map +1 -1
- package/build/core/middleware/index.d.ts +0 -1
- package/build/core/middleware/index.d.ts.map +1 -1
- package/build/core/middleware/index.js +0 -1
- package/build/core/middleware/index.js.map +1 -1
- package/build/core/middleware/localSettingsLoader.d.ts.map +1 -1
- package/build/core/middleware/localSettingsLoader.js +4 -4
- package/build/core/middleware/localSettingsLoader.js.map +1 -1
- package/build/core/middleware/localSettingsWriter.d.ts.map +1 -1
- package/build/core/middleware/localSettingsWriter.js +2 -1
- package/build/core/middleware/localSettingsWriter.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +29 -36
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/questionModel.d.ts +0 -1
- package/build/core/middleware/questionModel.d.ts.map +1 -1
- package/build/core/middleware/questionModel.js +1 -38
- package/build/core/middleware/questionModel.js.map +1 -1
- package/build/core/question.d.ts +0 -1
- package/build/core/question.d.ts.map +1 -1
- package/build/core/question.js +1 -26
- package/build/core/question.js.map +1 -1
- package/build/core/tools.d.ts +0 -2
- package/build/core/tools.d.ts.map +1 -1
- package/build/core/tools.js +3 -63
- package/build/core/tools.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.d.ts +0 -1
- package/build/plugins/resource/appstudio/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +12 -21
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.d.ts +2 -2
- package/build/plugins/resource/appstudio/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/index.js +28 -5
- package/build/plugins/resource/appstudio/v3/index.js.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.d.ts +17 -4
- package/build/plugins/resource/appstudio/v3/plugin.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/v3/plugin.js +124 -28
- package/build/plugins/resource/appstudio/v3/plugin.js.map +1 -1
- package/build/plugins/resource/bot/dotnet/plugin.d.ts +0 -2
- package/build/plugins/resource/bot/dotnet/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/dotnet/plugin.js +0 -6
- package/build/plugins/resource/bot/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/bot/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/plugin.js +47 -16
- package/build/plugins/resource/bot/plugin.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +3 -3
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +4 -4
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v3/index.js +1 -0
- package/build/plugins/resource/bot/v3/index.js.map +1 -1
- package/build/plugins/resource/frontend/constants.d.ts +1 -0
- package/build/plugins/resource/frontend/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/constants.js +1 -0
- package/build/plugins/resource/frontend/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/constants.d.ts +21 -0
- package/build/plugins/resource/frontend/dotnet/constants.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/constants.js +23 -1
- package/build/plugins/resource/frontend/dotnet/constants.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts +1 -0
- package/build/plugins/resource/frontend/dotnet/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/plugin.js +53 -0
- package/build/plugins/resource/frontend/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/dotnet/resources/errors.d.ts +3 -0
- package/build/plugins/resource/frontend/dotnet/resources/errors.d.ts.map +1 -1
- package/build/plugins/resource/frontend/dotnet/resources/errors.js +10 -1
- package/build/plugins/resource/frontend/dotnet/resources/errors.js.map +1 -1
- package/build/plugins/resource/frontend/index.d.ts +1 -0
- package/build/plugins/resource/frontend/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/index.js +4 -0
- package/build/plugins/resource/frontend/index.js.map +1 -1
- package/build/plugins/resource/frontend/interface.d.ts +1 -0
- package/build/plugins/resource/frontend/interface.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.d.ts +1 -0
- package/build/plugins/resource/frontend/plugin.d.ts.map +1 -1
- package/build/plugins/resource/frontend/plugin.js +3 -0
- package/build/plugins/resource/frontend/plugin.js.map +1 -1
- package/build/plugins/resource/frontend/v2/index.d.ts +1 -0
- package/build/plugins/resource/frontend/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v2/index.js +3 -0
- package/build/plugins/resource/frontend/v2/index.js.map +1 -1
- package/build/plugins/resource/frontend/v3/index.d.ts.map +1 -1
- package/build/plugins/resource/frontend/v3/index.js +18 -13
- package/build/plugins/resource/frontend/v3/index.js.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts +15 -3
- package/build/plugins/solution/fx-solution/commonQuestions.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/commonQuestions.js +14 -8
- package/build/plugins/solution/fx-solution/commonQuestions.js.map +1 -1
- package/build/plugins/solution/fx-solution/constants.d.ts +0 -2
- package/build/plugins/solution/fx-solution/constants.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/constants.js +0 -2
- package/build/plugins/solution/fx-solution/constants.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js +47 -8
- package/build/plugins/solution/fx-solution/debug/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/debug/scaffolding.js +6 -3
- package/build/plugins/solution/fx-solution/debug/scaffolding.js.map +1 -1
- package/build/plugins/solution/fx-solution/question.d.ts +0 -2
- package/build/plugins/solution/fx-solution/question.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/question.js +1 -14
- package/build/plugins/solution/fx-solution/question.js.map +1 -1
- package/build/plugins/solution/fx-solution/solution.d.ts +0 -2
- package/build/plugins/solution/fx-solution/solution.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/solution.js +4 -79
- package/build/plugins/solution/fx-solution/solution.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 +17 -0
- package/build/plugins/solution/fx-solution/v2/deploy.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 +1 -6
- 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 +4 -0
- package/build/plugins/solution/fx-solution/v2/provision.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts +0 -2
- package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js +1 -24
- package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map +1 -1
- package/build/plugins/solution/fx-solution/v2/scaffolding.js +1 -7
- package/build/plugins/solution/fx-solution/v2/scaffolding.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 +3 -4
- package/build/plugins/solution/fx-solution/v2/utils.js.map +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.js +1 -1
- package/build/plugins/solution/fx-solution/v3/provision.js.map +1 -1
- package/package.json +3 -3
- package/templates/plugins/resource/bot/bot-msgext.csharp.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot-msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.csharp.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.js.default.zip +0 -0
- package/templates/plugins/resource/bot/bot.ts.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.js.default.zip +0 -0
- package/templates/plugins/resource/bot/msgext.ts.default.zip +0 -0
- package/templates/plugins/resource/dotnet/blazor-base.csharp.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.csharp.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.js.default.zip +0 -0
- package/templates/plugins/resource/frontend/tab.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.js.default.zip +0 -0
- package/templates/plugins/resource/function/function-base.ts.default.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/plugins/resource/function/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/build/core/middleware/migrateConditionHandler.d.ts +0 -3
- package/build/core/middleware/migrateConditionHandler.d.ts.map +0 -1
- package/build/core/middleware/migrateConditionHandler.js +0 -23
- package/build/core/middleware/migrateConditionHandler.js.map +0 -1
- package/build/core/middleware/supportV1ConditionHandler.d.ts +0 -3
- package/build/core/middleware/supportV1ConditionHandler.d.ts.map +0 -1
- package/build/core/middleware/supportV1ConditionHandler.js +0 -23
- package/build/core/middleware/supportV1ConditionHandler.js.map +0 -1
|
@@ -66,10 +66,6 @@ export declare const LocalEnvFrontendKeys: Readonly<{
|
|
|
66
66
|
FuncName: string;
|
|
67
67
|
ClientId: string;
|
|
68
68
|
}>;
|
|
69
|
-
export declare const LocalEnvBotKeysMigratedFromV1: Readonly<{
|
|
70
|
-
BotId: string;
|
|
71
|
-
BotPassword: string;
|
|
72
|
-
}>;
|
|
73
69
|
export declare class LocalDebugCertificate {
|
|
74
70
|
static readonly CertFileName: string;
|
|
75
71
|
static readonly KeyFileName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,QAAQ,UAAU;IAClC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,SAAS;IACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;CAC/B;AAED,oBAAY,mBAAmB;IAC7B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,eAAO,MAAM,iBAAiB,2BAA2B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;;;;;;;;;;EAU3B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;EAe9B,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAe1B,CAAC;AAEH,eAAO,MAAM,gBAAgB;;;EAG3B,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAS/B,CAAC;AAEH,qBAAa,qBAAqB;IAChC,gBAAuB,YAAY,EAAE,MAAM,CAAmB;IAC9D,gBAAuB,WAAW,EAAE,MAAM,CAAmB;IAC7D,gBAAuB,YAAY,EAAE,MAAM,CAAqC;CACjF"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.LocalDebugCertificate = exports.
|
|
5
|
+
exports.LocalDebugCertificate = exports.LocalEnvFrontendKeys = exports.LocalEnvCertKeys = exports.LocalEnvBotKeys = exports.LocalEnvBackendKeys = exports.LocalEnvAuthKeys = exports.npmInstallCommand = exports.ProgrammingLanguage = exports.FolderName = void 0;
|
|
6
6
|
class FolderName {
|
|
7
7
|
}
|
|
8
8
|
exports.FolderName = FolderName;
|
|
@@ -73,10 +73,6 @@ exports.LocalEnvFrontendKeys = Object.freeze({
|
|
|
73
73
|
FuncName: "FRONTEND_REACT_APP_FUNC_NAME",
|
|
74
74
|
ClientId: "FRONTEND_REACT_APP_CLIENT_ID",
|
|
75
75
|
});
|
|
76
|
-
exports.LocalEnvBotKeysMigratedFromV1 = Object.freeze({
|
|
77
|
-
BotId: "BOT_BotId",
|
|
78
|
-
BotPassword: "BOT_BotPassword",
|
|
79
|
-
});
|
|
80
76
|
class LocalDebugCertificate {
|
|
81
77
|
}
|
|
82
78
|
exports.LocalDebugCertificate = LocalDebugCertificate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,MAAa,UAAU;;AAAvB,gCAKC;AAJiB,mBAAQ,GAAG,MAAM,CAAC;AAClB,cAAG,GAAG,KAAK,CAAC;AACZ,mBAAQ,GAAG,KAAK,CAAC;AACjB,eAAI,GAAG,MAAM,CAAC;AAGhC,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAEY,QAAA,iBAAiB,GAAG,wBAAwB,CAAC;AAE7C,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,aAAa,EAAE,qBAAqB;IACpC,kBAAkB,EAAE,2BAA2B;IAC/C,cAAc,EAAE,sBAAsB;IACtC,WAAW,EAAE,uBAAuB;IACpC,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,mBAAmB;CACjC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,cAAc,EAAE,6BAA6B;IAC7C,iBAAiB,EAAE,kCAAkC;IACrD,aAAa,EAAE,6BAA6B;IAC5C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,4BAA4B;IAC1C,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,2BAA2B;IACtC,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,sBAAsB;IACnC,UAAU,EAAE,qBAAqB;IACjC,WAAW,EAAE,sBAAsB;IACnC,gBAAgB,EAAE,iCAAiC;IACnD,aAAa,EAAE,yBAAyB;CACzC,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,kBAAkB;IAC/B,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,wBAAwB;IACtC,QAAQ,EAAE,oBAAoB;IAC9B,cAAc,EAAE,yBAAyB;IACzC,aAAa,EAAE,6BAA6B;IAC5C,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,uBAAuB;IAClC,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,6BAA6B;CAChD,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,uBAAuB;IACnC,UAAU,EAAE,uBAAuB;CACpC,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,eAAe;IACrB,eAAe,EAAE,qCAAqC;IACtD,QAAQ,EAAE,yCAAyC;IACnD,YAAY,EAAE,kCAAkC;IAChD,QAAQ,EAAE,8BAA8B;IACxC,QAAQ,EAAE,8BAA8B;CACzC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/local/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,MAAa,UAAU;;AAAvB,gCAKC;AAJiB,mBAAQ,GAAG,MAAM,CAAC;AAClB,cAAG,GAAG,KAAK,CAAC;AACZ,mBAAQ,GAAG,KAAK,CAAC;AACjB,eAAI,GAAG,MAAM,CAAC;AAGhC,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gDAAyB,CAAA;IACzB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAG9B;AAEY,QAAA,iBAAiB,GAAG,wBAAwB,CAAC;AAE7C,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,QAAQ,EAAE,gBAAgB;IAC1B,YAAY,EAAE,oBAAoB;IAClC,aAAa,EAAE,qBAAqB;IACpC,kBAAkB,EAAE,2BAA2B;IAC/C,cAAc,EAAE,sBAAsB;IACtC,WAAW,EAAE,uBAAuB;IACpC,aAAa,EAAE,sBAAsB;IACrC,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,mBAAmB;CACjC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,cAAc,EAAE,6BAA6B;IAC7C,iBAAiB,EAAE,kCAAkC;IACrD,aAAa,EAAE,6BAA6B;IAC5C,QAAQ,EAAE,wBAAwB;IAClC,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,4BAA4B;IAC1C,WAAW,EAAE,sBAAsB;IACnC,SAAS,EAAE,2BAA2B;IACtC,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,sBAAsB;IACnC,UAAU,EAAE,qBAAqB;IACjC,WAAW,EAAE,sBAAsB;IACnC,gBAAgB,EAAE,iCAAiC;IACnD,aAAa,EAAE,yBAAyB;CACzC,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,kBAAkB;IAC/B,QAAQ,EAAE,oBAAoB;IAC9B,YAAY,EAAE,wBAAwB;IACtC,QAAQ,EAAE,oBAAoB;IAC9B,cAAc,EAAE,yBAAyB;IACzC,aAAa,EAAE,6BAA6B;IAC5C,WAAW,EAAE,kBAAkB;IAC/B,SAAS,EAAE,uBAAuB;IAClC,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,kBAAkB;IAC/B,gBAAgB,EAAE,6BAA6B;CAChD,CAAC,CAAC;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,UAAU,EAAE,uBAAuB;IACnC,UAAU,EAAE,uBAAuB;CACpC,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,eAAe;IACrB,eAAe,EAAE,qCAAqC;IACtD,QAAQ,EAAE,yCAAyC;IACnD,YAAY,EAAE,kCAAkC;IAChD,QAAQ,EAAE,8BAA8B;IACxC,QAAQ,EAAE,8BAA8B;CACzC,CAAC,CAAC;AAEH,MAAa,qBAAqB;;AAAlC,sDAIC;AAHwB,kCAAY,GAAW,eAAe,CAAC;AACvC,iCAAW,GAAW,eAAe,CAAC;AACtC,kCAAY,GAAW,iCAAiC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAmB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAmB,MAAM,wBAAwB,CAAC;AA8CvF,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CA0CnB"}
|
|
@@ -12,7 +12,6 @@ const packageJsonHelper_1 = require("./packageJsonHelper");
|
|
|
12
12
|
const projectSettingsHelper_1 = require("./projectSettingsHelper");
|
|
13
13
|
const error_1 = require("../../core/error");
|
|
14
14
|
const telemetry_1 = require("../telemetry");
|
|
15
|
-
const frontendPortsV1 = [3000];
|
|
16
15
|
const frontendPorts = [53000];
|
|
17
16
|
const simpleAuthPorts = [55000];
|
|
18
17
|
const backendDebugPortRegex = /--inspect[\s]*=[\s"']*9229/im;
|
|
@@ -43,13 +42,7 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort, logg
|
|
|
43
42
|
const ports = [];
|
|
44
43
|
const includeFrontend = projectSettingsHelper_1.ProjectSettingsHelper.includeFrontend(projectSettings);
|
|
45
44
|
if (includeFrontend) {
|
|
46
|
-
|
|
47
|
-
if (!migrateFromV1) {
|
|
48
|
-
ports.push(...frontendPorts);
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
ports.push(...frontendPortsV1);
|
|
52
|
-
}
|
|
45
|
+
ports.push(...frontendPorts);
|
|
53
46
|
const includeSimpleAuth = projectSettingsHelper_1.ProjectSettingsHelper.includeSimpleAuth(projectSettings);
|
|
54
47
|
if (includeSimpleAuth) {
|
|
55
48
|
ports.push(...simpleAuthPorts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,wDAAuF;AACvF,mDAA6B;AAC7B,sEAAqC;AAErC,2CAAyC;AACzC,2DAA2D;AAC3D,mEAAgE;AAChE,4CAA8C;AAC9C,4CAKsB;AAEtB,MAAM,
|
|
1
|
+
{"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,5 @@ export declare class ProjectSettingsHelper {
|
|
|
6
6
|
static includeBot(projectSettings: ProjectSettings | undefined): boolean;
|
|
7
7
|
static includeAAD: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
8
8
|
static includeSimpleAuth: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
9
|
-
static isMigrateFromV1: (projectSettings: ProjectSettings | undefined) => boolean;
|
|
10
9
|
}
|
|
11
10
|
//# sourceMappingURL=projectSettingsHelper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAYhF,qBAAa,qBAAqB;IAEhC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEtD;WAEV,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAMtE,cAAc,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WASrE,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAK/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"projectSettingsHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAYhF,qBAAa,qBAAqB;IAEhC,OAAc,MAAM,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEtD;WAEV,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WAMtE,cAAc,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;WASrE,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO;IAK/E,OAAc,UAAU,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAG9E;IAEJ,OAAc,iBAAiB,oBAAqB,eAAe,GAAG,SAAS,KAAG,OAAO,CAEhD;CAC1C"}
|
|
@@ -33,12 +33,9 @@ ProjectSettingsHelper.isSpfx = (projectSettings) => {
|
|
|
33
33
|
};
|
|
34
34
|
ProjectSettingsHelper.includeAAD = (projectSettings) => {
|
|
35
35
|
var _a, _b;
|
|
36
|
-
return
|
|
37
|
-
!!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.includes(constants_1.ResourcePlugins.Aad));
|
|
36
|
+
return !!((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins) === null || _b === void 0 ? void 0 : _b.includes(constants_1.ResourcePlugins.Aad));
|
|
38
37
|
};
|
|
39
38
|
ProjectSettingsHelper.includeSimpleAuth = (projectSettings) =>
|
|
40
39
|
// TODO: update this when retiring simple auth service
|
|
41
|
-
|
|
42
|
-
!!tools_1.IsSimpleAuthEnabled(projectSettings);
|
|
43
|
-
ProjectSettingsHelper.isMigrateFromV1 = (projectSettings) => { var _a; return !!((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.migrateFromV1); };
|
|
40
|
+
!!tools_1.IsSimpleAuthEnabled(projectSettings);
|
|
44
41
|
//# sourceMappingURL=projectSettingsHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,4CAA+C;AAC/C,oCAA+C;AAE/C,MAAa,qBAAqB;IAMzB,MAAM,CAAC,eAAe,CAAC,eAA4C;QACxE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,GAAG,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QACjD,OAAO,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,eAA4C;QACvE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,cAAc,GAAG,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAA2B,KAAI,EAAE,CAAC;QAC5E,OAAO,CACL,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE;YACrD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,eAA4C;;QACnE,MAAM,GAAG,GAAG,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,YAAY,KAAI,EAAE,CAAC;QAC7F,OAAO,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;;AAxBH,
|
|
1
|
+
{"version":3,"file":"projectSettingsHelper.js","sourceRoot":"","sources":["../../../src/common/local/projectSettingsHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,0EAOqD;AACrD,4CAA+C;AAC/C,oCAA+C;AAE/C,MAAa,qBAAqB;IAMzB,MAAM,CAAC,eAAe,CAAC,eAA4C;QACxE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,GAAG,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QACjD,OAAO,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,eAA4C;QACvE,MAAM,gBAAgB,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAyC,CAAC;QACpF,MAAM,cAAc,GAAG,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAA2B,KAAI,EAAE,CAAC;QAC5E,OAAO,CACL,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,MAAK,8BAAmB,CAAC,EAAE;YACrD,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAClD,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,eAA4C;;QACnE,MAAM,GAAG,GAAG,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,YAAY,KAAI,EAAE,CAAC;QAC7F,OAAO,GAAG,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;;AAxBH,sDAkCC;AAjCC,2CAA2C;AAC7B,4BAAM,GAAG,CAAC,eAA4C,EAAW,EAAE;;IAC/E,OAAA,CAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,QAAQ;QACtE,6BAAkB,CAAC,EAAE,CAAA;CAAA,CAAC;AAsBV,gCAAU,GAAG,CAAC,eAA4C,EAAW,EAAE;;IACnF,OAAA,CAAC,CAAC,CAAA,MAAA,MAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAA0C,0CAAE,qBAAqB,0CAAE,QAAQ,CAC7F,2BAAe,CAAC,GAAG,CACpB,CAAA,CAAA;CAAA,CAAC;AAEU,uCAAiB,GAAG,CAAC,eAA4C,EAAW,EAAE;AAC1F,sDAAsD;AACtD,CAAC,CAAC,2BAAmB,CAAC,eAAe,CAAC,CAAC"}
|
|
@@ -3,11 +3,11 @@ export declare const localSettingsFileName = "localSettings.json";
|
|
|
3
3
|
export declare class LocalSettingsProvider {
|
|
4
4
|
readonly localSettingsFilePath: string;
|
|
5
5
|
constructor(workspaceFolder: string);
|
|
6
|
-
init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean,
|
|
7
|
-
initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean,
|
|
6
|
+
init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, includeSimpleAuth?: boolean, includeAAD?: boolean): LocalSettings;
|
|
7
|
+
initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, includeSimpleAuth?: boolean, includeAAD?: boolean): Json;
|
|
8
8
|
incrementalInitV2(localSettingsJson: Json, addBackaned: boolean, addBot: boolean, addFrontend: boolean): Json;
|
|
9
9
|
load(cryptoProvider?: CryptoProvider): Promise<LocalSettings | undefined>;
|
|
10
|
-
loadV2(cryptoProvider?: CryptoProvider): Promise<Json | undefined>;
|
|
10
|
+
loadV2(cryptoProvider?: CryptoProvider, includeAAD?: boolean): Promise<Json | undefined>;
|
|
11
11
|
private decryptLocalSettings;
|
|
12
12
|
save(localSettings: LocalSettings, cryptoProvider?: CryptoProvider): Promise<void>;
|
|
13
13
|
saveJson(localSettingsJson: Json, cryptoProvider?: CryptoProvider): Promise<Json>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAWhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAWhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,iBAAiB,UAAQ,EACzB,UAAU,UAAO,GAChB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,iBAAiB,UAAQ,EACzB,UAAU,UAAO,GAChB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CACjB,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAsB5B,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,QAAQ,CAAC,iBAAiB,UAAQ,GAAG,SAAS;IAmB9C,YAAY,IAAI,SAAS;IAazB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CASrB"}
|
|
@@ -13,7 +13,7 @@ class LocalSettingsProvider {
|
|
|
13
13
|
constructor(workspaceFolder) {
|
|
14
14
|
this.localSettingsFilePath = `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/${exports.localSettingsFileName}`;
|
|
15
15
|
}
|
|
16
|
-
init(includeFrontend, includeBackend, includeBotOrMessageExtension,
|
|
16
|
+
init(includeFrontend, includeBackend, includeBotOrMessageExtension, includeSimpleAuth = false, includeAAD = true) {
|
|
17
17
|
// initialize Teams app related config for local debug.
|
|
18
18
|
const teamsAppLocalConfig = new teamsfx_api_1.ConfigMap();
|
|
19
19
|
teamsAppLocalConfig.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId, "");
|
|
@@ -21,7 +21,7 @@ class LocalSettingsProvider {
|
|
|
21
21
|
const localSettings = {
|
|
22
22
|
teamsApp: teamsAppLocalConfig,
|
|
23
23
|
};
|
|
24
|
-
if (
|
|
24
|
+
if (includeAAD) {
|
|
25
25
|
localSettings.auth = this.initAuth(includeSimpleAuth);
|
|
26
26
|
}
|
|
27
27
|
// initialize frontend and simple auth local settings.
|
|
@@ -38,14 +38,14 @@ class LocalSettingsProvider {
|
|
|
38
38
|
}
|
|
39
39
|
return localSettings;
|
|
40
40
|
}
|
|
41
|
-
initV2(includeFrontend, includeBackend, includeBotOrMessageExtension,
|
|
41
|
+
initV2(includeFrontend, includeBackend, includeBotOrMessageExtension, includeSimpleAuth = false, includeAAD = true) {
|
|
42
42
|
const localSettings = {
|
|
43
43
|
teamsApp: {
|
|
44
44
|
[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId]: "",
|
|
45
45
|
[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TeamsAppId]: "",
|
|
46
46
|
},
|
|
47
47
|
};
|
|
48
|
-
if (
|
|
48
|
+
if (includeAAD) {
|
|
49
49
|
localSettings.auth = this.initAuth(includeSimpleAuth).toJSON();
|
|
50
50
|
}
|
|
51
51
|
// initialize frontend and simple auth local settings.
|
|
@@ -94,12 +94,18 @@ class LocalSettingsProvider {
|
|
|
94
94
|
return undefined;
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
|
-
async loadV2(cryptoProvider) {
|
|
97
|
+
async loadV2(cryptoProvider, includeAAD) {
|
|
98
98
|
if (await fs.pathExists(this.localSettingsFilePath)) {
|
|
99
99
|
const localSettingsJson = await fs.readJson(this.localSettingsFilePath);
|
|
100
100
|
if (localSettingsJson && cryptoProvider) {
|
|
101
101
|
const localSettings = this.convertToLocalSettings(localSettingsJson);
|
|
102
102
|
this.decryptLocalSettings(localSettings, cryptoProvider);
|
|
103
|
+
// TODO: Add auth part when scaffolding
|
|
104
|
+
// This part will add auth in localSettings when AAD plugin exists
|
|
105
|
+
// Will remove these when auth can be added through command
|
|
106
|
+
if (includeAAD && !localSettings.auth) {
|
|
107
|
+
localSettings.auth = new teamsfx_api_1.ConfigMap();
|
|
108
|
+
}
|
|
103
109
|
return this.convertToLocalSettingsJson(localSettings);
|
|
104
110
|
}
|
|
105
111
|
return localSettingsJson;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,qDAA+B;AAC/B,wDAOgC;AAChC,qEAQkC;AAErB,QAAA,qBAAqB,GAAG,oBAAoB,CAAC;AAC1D,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB,MAAa,qBAAqB;IAEhC,YAAY,eAAuB;QACjC,IAAI,CAAC,qBAAqB,GAAG,GAAG,eAAe,KAAK,8BAAgB,IAAI,oCAAsB,IAAI,6BAAqB,EAAE,CAAC;IAC5H,CAAC;IAEM,IAAI,CACT,eAAwB,EACxB,cAAuB,EACvB,4BAAqC,EACrC,
|
|
1
|
+
{"version":3,"file":"localSettingsProvider.js","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsValidator.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQhF,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"projectSettingsValidator.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQhF,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CA2B5F"}
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.validateProjectSettings = void 0;
|
|
6
6
|
const question_1 = require("../plugins/solution/fx-solution/question");
|
|
7
7
|
function validateProjectSettings(projectSettings) {
|
|
8
|
+
var _a;
|
|
8
9
|
if (!projectSettings)
|
|
9
10
|
return "empty projectSettings";
|
|
10
11
|
if (!projectSettings.solutionSettings)
|
|
@@ -27,6 +28,9 @@ function validateProjectSettings(projectSettings) {
|
|
|
27
28
|
if (validateRes) {
|
|
28
29
|
return `solutionSettings.activeResourcePlugins validation failed: ${validateRes}`;
|
|
29
30
|
}
|
|
31
|
+
if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings) === null || _a === void 0 ? void 0 : _a.migrateFromV1) {
|
|
32
|
+
return "The project created before v2.0.0 is only supported in the Teams Toolkit before v3.4.0.";
|
|
33
|
+
}
|
|
30
34
|
return undefined;
|
|
31
35
|
}
|
|
32
36
|
exports.validateProjectSettings = validateProjectSettings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsValidator.js","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,uEAKkD;AAElD,SAAgB,uBAAuB,CAAC,eAAgC
|
|
1
|
+
{"version":3,"file":"projectSettingsValidator.js","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,uEAKkD;AAElD,SAAgB,uBAAuB,CAAC,eAAgC;;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,gBAAgB;QAAE,OAAO,SAAS,CAAC;IACxD,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;IACnF,IAAI,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE;QACf,OAAO,sDAAsD,WAAW,EAAE,CAAC;KAC5E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAC/D,wBAAa,CAAC,EAAE;QAChB,wBAAa,CAAC,EAAE;QAChB,+BAAoB,CAAC,EAAE;QACvB,sBAAW,CAAC,EAAE;KACf,CAAC,CAAC;IACH,IAAI,WAAW,EAAE;QACf,OAAO,oDAAoD,WAAW,EAAE,CAAC;KAC1E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC1E,IAAI,WAAW,EAAE;QACf,OAAO,6DAA6D,WAAW,EAAE,CAAC;KACnF;IAED,IAAI,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,gBAAgB,0CAAE,aAAa,EAAE;QACpD,OAAO,yFAAyF,CAAC;KAClG;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AA3BD,0DA2BC;AAED,SAAS,mBAAmB,CAAC,GAAS,EAAE,KAAgB;IACtD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,cAAc,CAAC;KACvB;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,cAAc,CAAC;KACvB;IACD,KAAK,MAAM,OAAO,IAAI,GAAY,EAAE;QAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,mCAAmC,CAAC;SAC5C;QACD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,mCAAmC,KAAK,EAAE,CAAC;SACnD;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
"samples": [
|
|
5
5
|
{
|
|
6
6
|
"id": "hello-world-tab",
|
|
7
|
-
"title": "Hello World Tab",
|
|
7
|
+
"title": "Hello World Tab with SSO",
|
|
8
8
|
"shortDescription": "A Hello World app of Microsoft Teams Tab app",
|
|
9
9
|
"fullDescription": "This is a Hello World app of Microsoft Teams Tab app which accomplishes very simple function like single-sign on. You can run this app locally or deploy it to Microsoft Azure. This app only has a Tab frontend.",
|
|
10
|
-
"tags": ["Tab", "TS"],
|
|
10
|
+
"tags": ["Tab", "TS", "SSO"],
|
|
11
11
|
"time": "5min to run",
|
|
12
12
|
"configuration": "Ready for local debug",
|
|
13
13
|
"suggested": true
|
|
@@ -126,6 +126,16 @@
|
|
|
126
126
|
"time": "45min to run",
|
|
127
127
|
"configuration": "Manual configurations required",
|
|
128
128
|
"suggested": false
|
|
129
|
+
},
|
|
130
|
+
{
|
|
131
|
+
"id": "hello-world-tab-without-sso",
|
|
132
|
+
"title": "Hello World Tab",
|
|
133
|
+
"shortDescription": "A simple Microsft Teams Tab application displays static content",
|
|
134
|
+
"fullDescription": "This is a simple static tab application with tutorial to include single sign on features.",
|
|
135
|
+
"tags": ["Tab", "TS"],
|
|
136
|
+
"time": "5min to run",
|
|
137
|
+
"configuration": "Ready for local debug",
|
|
138
|
+
"suggested": false
|
|
129
139
|
}
|
|
130
140
|
]
|
|
131
141
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.0.0-
|
|
3
|
-
"tagPrefix": "templates
|
|
2
|
+
"version": "0.0.0-rc",
|
|
3
|
+
"tagPrefix": "templates@",
|
|
4
4
|
"tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
|
|
5
5
|
"templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download"
|
|
6
6
|
}
|
package/build/common/tools.d.ts
CHANGED
|
@@ -59,10 +59,6 @@ export declare function getAppDirectory(projectRoot: string): Promise<string>;
|
|
|
59
59
|
* Get app studio endpoint for prod/int environment, mainly for ux e2e test
|
|
60
60
|
*/
|
|
61
61
|
export declare function getAppStudioEndpoint(): string;
|
|
62
|
-
export declare function copyFiles(srcPath: string, distPath: string, excludeFileList?: {
|
|
63
|
-
fileName: string;
|
|
64
|
-
recursive: boolean;
|
|
65
|
-
}[]): Promise<void>;
|
|
66
62
|
export declare function getStorageAccountNameFromResourceId(resourceId: string): string;
|
|
67
63
|
export declare function getSiteNameFromResourceId(resourceId: string): string;
|
|
68
64
|
export declare function getResourceGroupNameFromResourceId(resourceId: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":";AAEA,OAAO,EAEL,oBAAoB,EAEpB,SAAS,EAET,OAAO,EACP,IAAI,EAGJ,MAAM,EAGN,gBAAgB,EAEhB,eAAe,EACf,eAAe,EAKhB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAQ,WAAW,EAAE,MAAM,eAAe,CAAC;AAsClD,eAAO,MAAM,QAAQ;8BACa,MAAM;;;;CAIvC,CAAC;AAEF,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAI5C;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa5E;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAYlD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,CAUrD;AAYD,eAAO,MAAM,kBAAkB,aAQ7B,CAAC;AAEH,eAAO,MAAM,cAAc,6BAA6B,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2B3E;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAiB9E;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,CAYR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAOlE;AAED,eAAO,MAAM,QAAQ,qBAwBpB,CAAC;AAEF,wBAAgB,UAAU,IAAI,GAAG,CAGhC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAOvD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAMzD;AAED,wBAAsB,eAAe,CACnC,oBAAoB,EAAE,oBAAoB,EAC1C,EAAE,EAAE,eAAe,EACnB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CA2C5C;AAED,wBAAgB,wBAAwB,CACtC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CAMpB;AAGD,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC;AAED,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED,wBAAgB,+BAA+B,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAG5F;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa1E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAM7C;AAED,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAS9E;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM1E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAG/E;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,wBAAgB,aAAa,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAOxE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,CAGzF;AAwDD;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BI;AACJ,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,SAAI,GAAG,OAAO,CAE9F;AAED,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAW3C;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CA+CtF"}
|
package/build/common/tools.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSideloadingStatus = exports.getAllowedAppIds = exports.redactObject = exports.IsSimpleAuthEnabled = exports.getHashedEnv = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.
|
|
3
|
+
exports.getSideloadingStatus = exports.getAllowedAppIds = exports.redactObject = exports.IsSimpleAuthEnabled = exports.getHashedEnv = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.getAppStudioEndpoint = exports.getAppDirectory = exports.compileHandlebarsTemplateString = exports.generateBicepFromFile = exports.getRootDirectory = exports.isConfigUnifyEnabled = exports.isBicepEnvCheckerEnabled = exports.isMultiEnvEnabled = exports.isFeatureFlagEnabled = exports.getResourceGroupInPortal = exports.askSubscription = exports.isCheckAccountError = exports.isUserCancelError = exports.getStrings = exports.deepCopy = exports.serializeDict = exports.replaceTemplateWithUserData = exports.convertDotenvToEmbeddedJson = exports.separateSecretData = exports.dataNeedEncryption = exports.AzurePortalUrl = exports.CryptoDataMatchers = exports.objectToConfigMap = exports.objectToMap = exports.mapToJson = exports.ensureUniqueFolder = exports.npmInstall = exports.Executor = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -383,9 +383,6 @@ function getAppStudioEndpoint() {
|
|
|
383
383
|
}
|
|
384
384
|
}
|
|
385
385
|
exports.getAppStudioEndpoint = getAppStudioEndpoint;
|
|
386
|
-
// TODO: remove copy files after https://github.com/OfficeDev/TeamsFx/pull/3998 is merged
|
|
387
|
-
async function copyFiles(srcPath, distPath, excludeFileList = []) { }
|
|
388
|
-
exports.copyFiles = copyFiles;
|
|
389
386
|
function getStorageAccountNameFromResourceId(resourceId) {
|
|
390
387
|
const result = parseFromResourceId(/providers\/Microsoft.Storage\/storageAccounts\/([^\/]*)/i, resourceId);
|
|
391
388
|
if (!result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}
|
package/build/core/error.d.ts
CHANGED
|
@@ -1,19 +1,13 @@
|
|
|
1
1
|
import { Func, FxError, Inputs, SystemError, UserError, Json } from "@microsoft/teamsfx-api";
|
|
2
2
|
export declare const CoreSource = "Core";
|
|
3
3
|
export declare function ProjectFolderExistError(path: string): UserError;
|
|
4
|
-
export declare function ProjectFolderNotExistError(path: string): UserError;
|
|
5
4
|
export declare function ProjectFolderInvalidError(path: string): UserError;
|
|
6
|
-
export declare function ArchiveUserFileError(path: string, reason: string): UserError;
|
|
7
|
-
export declare function ArchiveProjectError(reason: string): UserError;
|
|
8
5
|
export declare function EmptyProjectFolderError(): SystemError;
|
|
9
|
-
export declare function MigrateNotImplementError(path: string): SystemError;
|
|
10
6
|
export declare function WriteFileError(e: Error): SystemError;
|
|
11
7
|
export declare function ReadFileError(e: Error): SystemError;
|
|
12
8
|
export declare function CopyFileError(e: Error): SystemError;
|
|
13
9
|
export declare function NoneFxError(e: any): FxError;
|
|
14
10
|
export declare function NoProjectOpenedError(): UserError;
|
|
15
|
-
export declare function InvalidV1ProjectError(message?: string): UserError;
|
|
16
|
-
export declare function V1ProjectNotSupportedError(message?: string): UserError;
|
|
17
11
|
export declare function PathNotExistError(path: string): UserError;
|
|
18
12
|
export declare function InvalidProjectError(msg?: string): UserError;
|
|
19
13
|
export declare function InvalidProjectSettingsFileError(msg?: string): UserError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,WAAW,EACX,SAAS,EACT,IAAI,EAGL,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,UAAU,SAAS,CAAC;AAEjC,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAM/D;AAED,wBAAgB,
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EACJ,OAAO,EACP,MAAM,EACN,WAAW,EACX,SAAS,EACT,IAAI,EAGL,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,UAAU,SAAS,CAAC;AAEjC,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAM/D;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAMjE;AAED,wBAAgB,uBAAuB,IAAI,WAAW,CAErD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAEpD;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAEnD;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAEnD;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAI3C;AAED,wBAAgB,oBAAoB,IAAI,SAAS,CAMhD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAEzD;AAED,wBAAgB,mBAAmB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAM3D;AAED,wBAAgB,+BAA+B,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAMvE;AAED,qBAAa,mBAAoB,SAAQ,WAAW;gBACtC,IAAI,EAAE,MAAM;CAGzB;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAM5D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAQ5E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAMzD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,WAAW,UAAQ,GAAG,OAAO,CAkB5E;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,GAAG,WAAW,CAM9E;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,CAMjF;AAED,wBAAgB,6BAA6B,IAAI,WAAW,CAM3D;AAED,wBAAgB,0BAA0B,IAAI,WAAW,CAMxD;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAM9D;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAM/C;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAMhE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAS9E;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAE3D;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED,qBAAa,iBAAkB,SAAQ,WAAW;;CAIjD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;gBACtC,MAAM,EAAE,MAAM;CAG3B;AAED,qBAAa,sBAAuB,SAAQ,WAAW;gBACzC,IAAI,EAAE,MAAM;CAGzB;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED,wBAAgB,oBAAoB,IAAI,SAAS,CAOhD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,CAElD;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAMxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAEvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,GAAG,WAAW,CAEnE;AAED,wBAAgB,eAAe,IAAI,WAAW,CAE7C;AAED,qBAAa,wCAAyC,SAAQ,SAAS;gBACzD,IAAI,EAAE,MAAM;CAGzB"}
|
package/build/core/error.js
CHANGED
|
@@ -2,37 +2,21 @@
|
|
|
2
2
|
// Licensed under the MIT license.
|
|
3
3
|
"use strict";
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.OperationNotSupportedForExistingAppError = exports.LoadPluginError = exports.NpmInstallError = exports.SPFxConfigError = exports.FailedToParseResourceIdError = exports.NotJsonError = exports.UpgradeCanceledError = exports.ProjectSettingError = exports.SolutionConfigError = exports.ObjectIsUndefinedError = exports.NotImplementedError = exports.LoadSolutionError = exports.ModifiedSecretError = exports.NonExistEnvNameError = exports.InvalidEnvConfigError = exports.ProjectEnvAlreadyExistError = exports.InvalidEnvNameError = exports.ProjectEnvNotExistError = exports.MultipleEnvNotEnabledError = exports.ProjectSettingsUndefinedError = exports.PluginHasNoTaskImpl = exports.InvalidStateError = exports.ContextUpgradeError = exports.FunctionRouterError = exports.InvalidInputError = exports.FetchSampleError = exports.TaskNotSupportError = exports.InvalidProjectSettingsFileError = exports.InvalidProjectError = exports.PathNotExistError = exports.
|
|
5
|
+
exports.OperationNotSupportedForExistingAppError = exports.LoadPluginError = exports.NpmInstallError = exports.SPFxConfigError = exports.FailedToParseResourceIdError = exports.NotJsonError = exports.UpgradeCanceledError = exports.ProjectSettingError = exports.SolutionConfigError = exports.ObjectIsUndefinedError = exports.NotImplementedError = exports.LoadSolutionError = exports.ModifiedSecretError = exports.NonExistEnvNameError = exports.InvalidEnvConfigError = exports.ProjectEnvAlreadyExistError = exports.InvalidEnvNameError = exports.ProjectEnvNotExistError = exports.MultipleEnvNotEnabledError = exports.ProjectSettingsUndefinedError = exports.PluginHasNoTaskImpl = exports.InvalidStateError = exports.ContextUpgradeError = exports.FunctionRouterError = exports.InvalidInputError = exports.FetchSampleError = exports.TaskNotSupportError = exports.InvalidProjectSettingsFileError = exports.InvalidProjectError = exports.PathNotExistError = exports.NoProjectOpenedError = exports.NoneFxError = exports.CopyFileError = exports.ReadFileError = exports.WriteFileError = exports.EmptyProjectFolderError = exports.ProjectFolderInvalidError = exports.ProjectFolderExistError = exports.CoreSource = void 0;
|
|
6
6
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
7
7
|
exports.CoreSource = "Core";
|
|
8
8
|
function ProjectFolderExistError(path) {
|
|
9
9
|
return new teamsfx_api_1.UserError("ProjectFolderExistError", `Path ${path} already exists. Select a different folder.`, exports.CoreSource);
|
|
10
10
|
}
|
|
11
11
|
exports.ProjectFolderExistError = ProjectFolderExistError;
|
|
12
|
-
function ProjectFolderNotExistError(path) {
|
|
13
|
-
return new teamsfx_api_1.UserError("ProjectFolderNotExistError", `Path ${path} does not exist. Select a different folder.`, exports.CoreSource);
|
|
14
|
-
}
|
|
15
|
-
exports.ProjectFolderNotExistError = ProjectFolderNotExistError;
|
|
16
12
|
function ProjectFolderInvalidError(path) {
|
|
17
13
|
return new teamsfx_api_1.UserError("ProjectFolderInvalidError", `Path ${path} is invalid, please set valid root folder in user settings(Use absolute directory or relative directory start with \${homeDir} ).`, exports.CoreSource);
|
|
18
14
|
}
|
|
19
15
|
exports.ProjectFolderInvalidError = ProjectFolderInvalidError;
|
|
20
|
-
function ArchiveUserFileError(path, reason) {
|
|
21
|
-
return new teamsfx_api_1.UserError("ArchiveUserFileError", `Failed to archive path '${path}'. ${reason}. You can refer to .archive.log which provides detailed information about the archive process.`, exports.CoreSource);
|
|
22
|
-
}
|
|
23
|
-
exports.ArchiveUserFileError = ArchiveUserFileError;
|
|
24
|
-
function ArchiveProjectError(reason) {
|
|
25
|
-
return new teamsfx_api_1.UserError("ArchiveProjectError", `Failed to archive the project. ${reason}. You can refer to .archive.log which provides detailed information about the archive process.`, exports.CoreSource);
|
|
26
|
-
}
|
|
27
|
-
exports.ArchiveProjectError = ArchiveProjectError;
|
|
28
16
|
function EmptyProjectFolderError() {
|
|
29
17
|
return new teamsfx_api_1.SystemError("EmptyProjectFolderError", "Project path is empty", exports.CoreSource);
|
|
30
18
|
}
|
|
31
19
|
exports.EmptyProjectFolderError = EmptyProjectFolderError;
|
|
32
|
-
function MigrateNotImplementError(path) {
|
|
33
|
-
return new teamsfx_api_1.SystemError("MigrateNotImplemented", `Migrate V1 Project is not implemented.`, exports.CoreSource);
|
|
34
|
-
}
|
|
35
|
-
exports.MigrateNotImplementError = MigrateNotImplementError;
|
|
36
20
|
function WriteFileError(e) {
|
|
37
21
|
return new teamsfx_api_1.SystemError(e, exports.CoreSource, "WriteFileError");
|
|
38
22
|
}
|
|
@@ -55,14 +39,6 @@ function NoProjectOpenedError() {
|
|
|
55
39
|
return new teamsfx_api_1.UserError("NoProjectOpened", "No project opened, you can create a new project or open an existing one.", exports.CoreSource);
|
|
56
40
|
}
|
|
57
41
|
exports.NoProjectOpenedError = NoProjectOpenedError;
|
|
58
|
-
function InvalidV1ProjectError(message) {
|
|
59
|
-
return new teamsfx_api_1.UserError("InvalidV1Project", `The project is not a valid Teams Toolkit V1 project. ${message}`, exports.CoreSource);
|
|
60
|
-
}
|
|
61
|
-
exports.InvalidV1ProjectError = InvalidV1ProjectError;
|
|
62
|
-
function V1ProjectNotSupportedError(message) {
|
|
63
|
-
return new teamsfx_api_1.UserError("V1ProjectNotSupported", `Command is not supported in the project migrated from Teams Toolkit V1`, exports.CoreSource);
|
|
64
|
-
}
|
|
65
|
-
exports.V1ProjectNotSupportedError = V1ProjectNotSupportedError;
|
|
66
42
|
function PathNotExistError(path) {
|
|
67
43
|
return new teamsfx_api_1.UserError("PathNotExist", `The path not exist: ${path}`, exports.CoreSource);
|
|
68
44
|
}
|
package/build/core/error.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAUgC;AAEnB,QAAA,UAAU,GAAG,MAAM,CAAC;AAEjC,SAAgB,uBAAuB,CAAC,IAAY;IAClD,OAAO,IAAI,uBAAS,CAClB,yBAAyB,EACzB,QAAQ,IAAI,6CAA6C,EACzD,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,0DAMC;AAED,SAAgB,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"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"}
|