@microsoft/teamsfx-core 1.8.0-rc.1 → 1.8.0-rc.4
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/featureFlags.d.ts +3 -3
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +8 -8
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/samples-config.json +0 -14
- package/build/common/samples.js +2 -3
- package/build/common/samples.js.map +1 -1
- package/build/common/telemetry.d.ts +1 -0
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +1 -0
- package/build/common/telemetry.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +8 -1
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.d.ts.map +1 -1
- package/build/core/middleware/consolidateLocalRemote.js +89 -6
- package/build/core/middleware/consolidateLocalRemote.js.map +1 -1
- package/build/plugins/resource/frontend/env.js +3 -2
- package/build/plugins/resource/frontend/env.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 -1
- package/build/plugins/solution/fx-solution/v2/getQuestions.js.map +1 -1
- package/package.json +2 -2
- package/resource/package.nls.json +1 -0
- package/resource/unify-config-change-logs.md +3 -1
- 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.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/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/apiconnector/package.json +1 -1
- 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/bot.ts.notification.zip +0 -0
- package/templates/fallback/msgext.js.default.zip +0 -0
- package/templates/fallback/msgext.ts.default.zip +0 -0
|
@@ -66,7 +66,7 @@ export declare class FeatureFlagName {
|
|
|
66
66
|
static readonly GeneratorCheckerEnable = "TEAMSFX_GENERATOR_ENV_CHECKER_ENABLE";
|
|
67
67
|
static readonly ApiConnect = "TEAMSFX_API_CONNECT_ENABLE";
|
|
68
68
|
static readonly DeployManifest = "TEAMSFX_DEPLOY_MANIFEST";
|
|
69
|
-
static readonly
|
|
69
|
+
static readonly Preview = "TEAMSFX_PREVIEW";
|
|
70
70
|
}
|
|
71
71
|
export declare class ManifestVariables {
|
|
72
72
|
static readonly DeveloperWebsiteUrl = "developerWebsiteUrl";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,YAAY,WAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,qCAAqC;IAC3E,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wBAAwB;IAC1D,MAAM,CAAC,QAAQ,CAAC,UAAU,eAAe;CAC1C;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,gBAAgB,6CAA6C;IAC7E,MAAM,CAAC,QAAQ,CAAC,WAAW,qCAAqC;IAGhE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kDAAkD;CACrF;AAED,qBAAa,KAAK;IAChB,MAAM,CAAC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAA0B;IAChF,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAA2B;IAC9E,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,MAAM,CAA2B;IAC9E,MAAM,CAAC,QAAQ,CAAC,8BAA8B,EAAE,MAAM,CAA8B;IACpF,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAqB;IAC9D,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAA8B;IACvE,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAA2B;CAClE;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,0CAA0C;IACvE,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0C;CAC9D;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,GAAG,mCAAmC;IACtD,MAAM,CAAC,QAAQ,CAAC,eAAe,kCAAkC;IACjE,MAAM,CAAC,QAAQ,CAAC,UAAU,6BAA6B;IACvD,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,UAAU,6BAA6B;IACvD,MAAM,CAAC,QAAQ,CAAC,QAAQ,2BAA2B;IACnD,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA0B;IAClD,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA0B;IAClD,MAAM,CAAC,QAAQ,CAAC,IAAI,sBAAsB;IAC1C,MAAM,CAAC,QAAQ,CAAC,IAAI,sBAAsB;IAC1C,MAAM,CAAC,QAAQ,CAAC,SAAS,2BAA2B;CACrD;AACD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,QAAQ,mBAAmB;IAC3C,MAAM,CAAC,QAAQ,CAAC,YAAY,UAAU;CACvC;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,qBAAqB,sCAAsC;IAC3E,MAAM,CAAC,QAAQ,CAAC,KAAK,mBAAmB;IAExC,MAAM,CAAC,QAAQ,CAAC,cAAc,+BAA+B;IAC7D,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,YAAY,oBAAoB;IAChD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,cAAc,sBAAsB;IACpD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,cAAc,qBAAqB;IACnD,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,OAAO,sBAAsB;IAC7C,MAAM,CAAC,QAAQ,CAAC,eAAe,mCAAmC;IAClE,MAAM,CAAC,QAAQ,CAAC,sBAAsB,0CAA0C;IAChF,MAAM,CAAC,QAAQ,CAAC,UAAU,gCAAgC;IAC1D,MAAM,CAAC,QAAQ,CAAC,cAAc,6BAA6B;IAC3D,MAAM,CAAC,QAAQ,CAAC,OAAO,qBAAqB;CAC7C;AAED,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAC5D,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAC5D,MAAM,CAAC,QAAQ,CAAC,sBAAsB,4BAA4B;IAClE,MAAM,CAAC,QAAQ,CAAC,aAAa,mBAAmB;IAChD,MAAM,CAAC,QAAQ,CAAC,aAAa,mBAAmB;IAChD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAC5D,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW;CACjC"}
|
|
@@ -81,7 +81,7 @@ FeatureFlagName.YoCheckerEnable = "TEAMSFX_YO_ENV_CHECKER_ENABLE";
|
|
|
81
81
|
FeatureFlagName.GeneratorCheckerEnable = "TEAMSFX_GENERATOR_ENV_CHECKER_ENABLE";
|
|
82
82
|
FeatureFlagName.ApiConnect = "TEAMSFX_API_CONNECT_ENABLE";
|
|
83
83
|
FeatureFlagName.DeployManifest = "TEAMSFX_DEPLOY_MANIFEST";
|
|
84
|
-
FeatureFlagName.
|
|
84
|
+
FeatureFlagName.Preview = "TEAMSFX_PREVIEW";
|
|
85
85
|
class ManifestVariables {
|
|
86
86
|
}
|
|
87
87
|
exports.ManifestVariables = ManifestVariables;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAc;;AAA3B,wCAKC;AAJiB,2BAAY,GAAG,OAAO,CAAC;AACvB,qCAAsB,GAAG,iCAAiC,CAAC;AAC3D,iCAAkB,GAAG,oBAAoB,CAAC;AAC1C,yBAAU,GAAG,WAAW,CAAC;AAG3C,MAAa,SAAS;;AAAtB,8BAMC;AALiB,0BAAgB,GAAG,yCAAyC,CAAC;AAC7D,qBAAW,GAAG,iCAAiC,CAAC;AAEhE,+BAA+B;AACf,4BAAkB,GAAG,8CAA8C,CAAC;AAGtF,MAAa,KAAK;;AAAlB,sBAQC;AAPiB,oCAA8B,GAAW,sBAAsB,CAAC;AAChE,iCAA2B,GAAW,uBAAuB,CAAC;AAC9D,iCAA2B,GAAW,uBAAuB,CAAC;AAC9D,oCAA8B,GAAW,0BAA0B,CAAC;AACpE,uBAAiB,GAAW,iBAAiB,CAAC;AAC9C,uBAAiB,GAAW,0BAA0B,CAAC;AACvD,oBAAc,GAAW,uBAAuB,CAAC;AAGnE,MAAa,aAAa;;AAA1B,sCAGC;AAFiB,2BAAa,GAAG,sCAAsC,CAAC;AACvD,iBAAG,GAAG,sCAAsC,CAAC;AAG/D,MAAa,cAAc;;AAA3B,wCAIC;AAHiB,sBAAO,GAAG,sCAAsC,CAAC;AACjD,mBAAI,GAAG,sCAAsC,CAAC;AAC9C,mBAAI,GAAG,sCAAsC,CAAC;AAGhE,MAAa,eAAe;;AAA5B,0CAIC;AAHiB,uBAAO,GAAG,sCAAsC,CAAC;AACjD,oBAAI,GAAG,sCAAsC,CAAC;AAC9C,oBAAI,GAAG,sCAAsC,CAAC;AAGhE,MAAa,eAAe;;AAA5B,0CAYC;AAXiB,mBAAG,GAAG,+BAA+B,CAAC;AACtC,+BAAe,GAAG,8BAA8B,CAAC;AACjD,0BAAU,GAAG,yBAAyB,CAAC;AACvC,mBAAG,GAAG,iBAAiB,CAAC;AACxB,0BAAU,GAAG,yBAAyB,CAAC;AACvC,wBAAQ,GAAG,uBAAuB,CAAC;AACnC,wBAAQ,GAAG,sBAAsB,CAAC;AAClC,wBAAQ,GAAG,sBAAsB,CAAC;AAClC,oBAAI,GAAG,kBAAkB,CAAC;AAC1B,oBAAI,GAAG,kBAAkB,CAAC;AAC1B,yBAAS,GAAG,uBAAuB,CAAC;AAEtD,MAAa,iBAAiB;;AAA9B,8CAGC;AAFiB,0BAAQ,GAAG,eAAe,CAAC;AAC3B,8BAAY,GAAG,MAAM,CAAC;AAGxC,MAAa,eAAe;;AAA5B,0CAmBC;AAlBiB,qCAAqB,GAAG,kCAAkC,CAAC;AAC3D,qBAAK,GAAG,eAAe,CAAC;AACxC,gGAAgG;AAChF,8BAAc,GAAG,2BAA2B,CAAC;AAC7C,6BAAa,GAAG,wBAAwB,CAAC;AACzC,4BAAY,GAAG,gBAAgB,CAAC;AAChC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,8BAAc,GAAG,kBAAkB,CAAC;AACpC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,6BAAa,GAAG,wBAAwB,CAAC;AACzC,8BAAc,GAAG,iBAAiB,CAAC;AACnC,+BAAe,GAAG,0BAA0B,CAAC;AAC7C,uBAAO,GAAG,kBAAkB,CAAC;AAC7B,+BAAe,GAAG,+BAA+B,CAAC;AAClD,sCAAsB,GAAG,sCAAsC,CAAC;AAChE,0BAAU,GAAG,4BAA4B,CAAC;AAC1C,8BAAc,GAAG,yBAAyB,CAAC;AAC3C,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare function isFeatureFlagEnabled(featureFlagName: string, defaultValue?: boolean): boolean;
|
|
2
2
|
/**
|
|
3
|
-
* Update feature flags
|
|
3
|
+
* Update all preview feature flags.
|
|
4
4
|
*/
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function initializePreviewFeatureFlags(): void;
|
|
6
6
|
export declare function isBotNotificationEnabled(): boolean;
|
|
7
|
-
export declare function
|
|
7
|
+
export declare function isPreviewFeaturesEnabled(): boolean;
|
|
8
8
|
//# sourceMappingURL=featureFlags.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAMA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AAED;;GAEG;AACH,wBAAgB,
|
|
1
|
+
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":"AAMA,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AAED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAUpD;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isPreviewFeaturesEnabled = exports.isBotNotificationEnabled = exports.initializePreviewFeatureFlags = exports.isFeatureFlagEnabled = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
// Copyright (c) Microsoft Corporation.
|
|
6
6
|
// Licensed under the MIT license.
|
|
@@ -18,10 +18,10 @@ function isFeatureFlagEnabled(featureFlagName, defaultValue = false) {
|
|
|
18
18
|
}
|
|
19
19
|
exports.isFeatureFlagEnabled = isFeatureFlagEnabled;
|
|
20
20
|
/**
|
|
21
|
-
* Update feature flags
|
|
21
|
+
* Update all preview feature flags.
|
|
22
22
|
*/
|
|
23
|
-
function
|
|
24
|
-
if (isFeatureFlagEnabled(constants_1.FeatureFlagName.
|
|
23
|
+
function initializePreviewFeatureFlags() {
|
|
24
|
+
if (isFeatureFlagEnabled(constants_1.FeatureFlagName.Preview, false)) {
|
|
25
25
|
process.env[constants_1.FeatureFlagName.BotNotification] = "true";
|
|
26
26
|
process.env[constants_1.FeatureFlagName.M365App] = "true";
|
|
27
27
|
process.env[constants_1.FeatureFlagName.ExistingTabApp] = "true";
|
|
@@ -31,13 +31,13 @@ function initializeGAFeatureFlags() {
|
|
|
31
31
|
process.env[constants_1.FeatureFlagName.DeployManifest] = "true";
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
-
exports.
|
|
34
|
+
exports.initializePreviewFeatureFlags = initializePreviewFeatureFlags;
|
|
35
35
|
function isBotNotificationEnabled() {
|
|
36
36
|
return isFeatureFlagEnabled(constants_1.FeatureFlagName.BotNotification, false);
|
|
37
37
|
}
|
|
38
38
|
exports.isBotNotificationEnabled = isBotNotificationEnabled;
|
|
39
|
-
function
|
|
40
|
-
return isFeatureFlagEnabled(constants_1.FeatureFlagName.
|
|
39
|
+
function isPreviewFeaturesEnabled() {
|
|
40
|
+
return isFeatureFlagEnabled(constants_1.FeatureFlagName.Preview, false);
|
|
41
41
|
}
|
|
42
|
-
exports.
|
|
42
|
+
exports.isPreviewFeaturesEnabled = isPreviewFeaturesEnabled;
|
|
43
43
|
//# sourceMappingURL=featureFlags.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,yDAAmC;AACnC,2CAA8C;AAE9C,kFAAkF;AAClF,SAAgB,oBAAoB,CAAC,eAAuB,EAAE,YAAY,GAAG,KAAK;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC1C,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,YAAY,CAAC,CAAC,2EAA2E;KACjG;SAAM;QACL,OAAO,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,6EAA6E;KACpI;AACH,CAAC;AAPD,oDAOC;AAED;;GAEG;AACH,SAAgB,
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../src/common/featureFlags.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,yDAAmC;AACnC,2CAA8C;AAE9C,kFAAkF;AAClF,SAAgB,oBAAoB,CAAC,eAAuB,EAAE,YAAY,GAAG,KAAK;IAChF,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC1C,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,YAAY,CAAC,CAAC,2EAA2E;KACjG;SAAM;QACL,OAAO,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,6EAA6E;KACpI;AACH,CAAC;AAPD,oDAOC;AAED;;GAEG;AACH,SAAgB,6BAA6B;IAC3C,IAAI,oBAAoB,CAAC,2BAAe,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;QACxD,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,eAAe,CAAC,GAAG,MAAM,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;QACjD,OAAO,CAAC,GAAG,CAAC,2BAAe,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;KACtD;AACH,CAAC;AAVD,sEAUC;AAED,SAAgB,wBAAwB;IACtC,OAAO,oBAAoB,CAAC,2BAAe,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACtE,CAAC;AAFD,4DAEC;AAED,SAAgB,wBAAwB;IACtC,OAAO,oBAAoB,CAAC,2BAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC;AAFD,4DAEC"}
|
|
@@ -136,20 +136,6 @@
|
|
|
136
136
|
"time": "5min to run",
|
|
137
137
|
"configuration": "Ready for local debug",
|
|
138
138
|
"suggested": false
|
|
139
|
-
},
|
|
140
|
-
{
|
|
141
|
-
"id": "bot-proactive-messaging-teamsfx",
|
|
142
|
-
"title": "Proactive Messaging",
|
|
143
|
-
"shortDescription": "Demonstrates how to send proactive messages to users.",
|
|
144
|
-
"fullDescription": "This is a sample which shows how to save user's conversation reference information to send proactive reminder message using Bots.",
|
|
145
|
-
"tags": [
|
|
146
|
-
"Bot", "JS"
|
|
147
|
-
],
|
|
148
|
-
"time": "5min to run",
|
|
149
|
-
"configuration": "Ready for local debug",
|
|
150
|
-
"suggested": false,
|
|
151
|
-
"url": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/",
|
|
152
|
-
"packageLink": "https://github.com/OfficeDev/Microsoft-Teams-Samples/archive/refs/heads/main.zip"
|
|
153
139
|
}
|
|
154
140
|
]
|
|
155
141
|
}
|
package/build/common/samples.js
CHANGED
|
@@ -7,7 +7,6 @@ class SampleProvider {
|
|
|
7
7
|
get SampleCollection() {
|
|
8
8
|
if (!this.sampleCollection) {
|
|
9
9
|
const samples = samples_config_json_1.default.samples.map((sample) => {
|
|
10
|
-
var _a, _b;
|
|
11
10
|
return {
|
|
12
11
|
id: sample.id,
|
|
13
12
|
title: sample.title,
|
|
@@ -16,9 +15,9 @@ class SampleProvider {
|
|
|
16
15
|
tags: sample.tags,
|
|
17
16
|
time: sample.time,
|
|
18
17
|
configuration: sample.configuration,
|
|
19
|
-
link:
|
|
18
|
+
link: samples_config_json_1.default.defaultPackageLink,
|
|
20
19
|
suggested: sample.suggested,
|
|
21
|
-
url:
|
|
20
|
+
url: samples_config_json_1.default.baseUrl,
|
|
22
21
|
};
|
|
23
22
|
});
|
|
24
23
|
this.sampleCollection = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":";;;;AAAA,wFAAiD;AAmBjD,MAAM,cAAc;IAGlB,IAAW,gBAAgB;QACzB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,OAAO,GAAG,6BAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":";;;;AAAA,wFAAiD;AAmBjD,MAAM,cAAc;IAGlB,IAAW,gBAAgB;QACzB,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,OAAO,GAAG,6BAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAClD,OAAO;oBACL,EAAE,EAAE,MAAM,CAAC,EAAE;oBACb,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;oBACzC,eAAe,EAAE,MAAM,CAAC,eAAe;oBACvC,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,aAAa,EAAE,MAAM,CAAC,aAAa;oBACnC,IAAI,EAAE,6BAAY,CAAC,kBAAkB;oBACrC,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,GAAG,EAAE,6BAAY,CAAC,OAAO;iBACZ,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,gBAAgB,GAAG;gBACtB,OAAO;aACR,CAAC;SACH;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAEY,QAAA,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -72,6 +72,7 @@ export declare enum TelemetryEvent {
|
|
|
72
72
|
ProjectConsolidateGuideStart = "project-Consolidate-guide-start",
|
|
73
73
|
ProjectConsolidateGuide = "project-consolidate-guide",
|
|
74
74
|
ProjectConsolidateError = "project-consolidate-error",
|
|
75
|
+
ProjectConsolidateCheckManifestError = "project-consolidate-check-manifest-error",
|
|
75
76
|
DetectPortStart = "detect-port-start",
|
|
76
77
|
DetectPort = "detect-port"
|
|
77
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,6 +79,7 @@ var TelemetryEvent;
|
|
|
79
79
|
TelemetryEvent["ProjectConsolidateGuideStart"] = "project-Consolidate-guide-start";
|
|
80
80
|
TelemetryEvent["ProjectConsolidateGuide"] = "project-consolidate-guide";
|
|
81
81
|
TelemetryEvent["ProjectConsolidateError"] = "project-consolidate-error";
|
|
82
|
+
TelemetryEvent["ProjectConsolidateCheckManifestError"] = "project-consolidate-check-manifest-error";
|
|
82
83
|
TelemetryEvent["DetectPortStart"] = "detect-port-start";
|
|
83
84
|
TelemetryEvent["DetectPort"] = "detect-port";
|
|
84
85
|
})(TelemetryEvent = exports.TelemetryEvent || (exports.TelemetryEvent = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA+E;AAE/E,MAAa,yBAAyB;CAErC;AAFD,8DAEC;AAED,IAAY,iBAoBX;AApBD,WAAY,iBAAiB;IAC3B,iDAA4B,CAAA;IAC5B,4CAAuB,CAAA;IACvB,oCAAe,CAAA;IACf,wCAAmB,CAAA;IACnB,6CAAwB,CAAA;IACxB,6CAAwB,CAAA;IACxB,mDAA8B,CAAA;IAC9B,sDAAiC,CAAA;IACjC,6CAAwB,CAAA;IACxB,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,iFAA4D,CAAA;IAC5D,6CAAwB,CAAA;IACxB,sCAAiB,CAAA;IACjB,0CAAqB,CAAA;IACrB,uDAAkC,CAAA;IAClC,kDAA6B,CAAA;IAC7B,qDAAgC,CAAA;IAChC,oEAA+C,CAAA;AACjD,CAAC,EApBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAoB5B;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrentLocker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAuB1E,eAAO,MAAM,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"concurrentLocker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAuB1E,eAAO,MAAM,kBAAkB,EAAE,UAoFhC,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAKzD"}
|
|
@@ -18,6 +18,7 @@ const os = tslib_1.__importStar(require("os"));
|
|
|
18
18
|
const tools_1 = require("../../common/tools");
|
|
19
19
|
let doingTask = undefined;
|
|
20
20
|
const ConcurrentLockerMW = async (ctx, next) => {
|
|
21
|
+
var _a, _b;
|
|
21
22
|
const inputs = ctx.arguments[ctx.arguments.length - 1];
|
|
22
23
|
if (projectSettingsLoader_1.shouldIgnored(ctx)) {
|
|
23
24
|
await next();
|
|
@@ -78,7 +79,13 @@ const ConcurrentLockerMW = async (ctx, next) => {
|
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
81
|
if (!acquired) {
|
|
81
|
-
|
|
82
|
+
const log = `[core] failed to acquire lock for task ${taskName} on: ${configFolder}`;
|
|
83
|
+
if (inputs.loglevel && inputs.loglevel === "Debug") {
|
|
84
|
+
(_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.debug(log);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
(_b = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider) === null || _b === void 0 ? void 0 : _b.error(log);
|
|
88
|
+
}
|
|
82
89
|
// failed for 10 times and finally failed
|
|
83
90
|
telemetry_1.sendTelemetryErrorEvent(error_1.CoreSource, "concurrent-operation", new teamsfx_api_1.ConcurrentError(error_1.CoreSource), {
|
|
84
91
|
retry: retryNum + "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrentLocker.js","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,wDAQgC;AAChC,qDAA+B;AAC/B,mDAA6B;AAC7B,qDAA+C;AAC/C,8CAAsC;AACtC,sDAAiE;AACjE,0CAA+C;AAC/C,oCAAoG;AACpG,mEAAwD;AACxD,4DAA4B;AAC5B,+CAAyB;AACzB,8CAAiD;AAEjD,IAAI,SAAS,GAAuB,SAAS,CAAC;AACvC,MAAM,kBAAkB,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"concurrentLocker.js","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AA6B3C,eAAO,MAAM,oBAAoB,EAAE,UAqBlC,CAAC;AA2CF,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBvF"}
|
|
@@ -23,10 +23,21 @@ const constants_1 = require("../../plugins/resource/spfx/utils/constants");
|
|
|
23
23
|
const upgradeButton = "Upgrade";
|
|
24
24
|
const LearnMore = "Learn More";
|
|
25
25
|
const LearnMoreLink = "https://aka.ms/teamsfx-unify-config-guide";
|
|
26
|
+
const UnifyManifestLearMoreLink = "https://aka.ms/teamsfx-unify-local-remote-manifest-guide";
|
|
26
27
|
let userCancelFlag = false;
|
|
27
28
|
const backupFolder = ".backup";
|
|
28
29
|
const methods = new Set(["getProjectConfig", "checkPermission"]);
|
|
29
30
|
const upgradeReportName = "unify-config-change-logs.md";
|
|
31
|
+
const componentIdRegex = /(?<=componentId=)([a-z0-9-]*)(?=%26)/;
|
|
32
|
+
const manifestRegex = /{{{.*}}}|{{.*}}|{.*}/g;
|
|
33
|
+
const ignoreKeys = new Set([
|
|
34
|
+
"name",
|
|
35
|
+
"contentUrl",
|
|
36
|
+
"configurationUrl",
|
|
37
|
+
"manifestVersion",
|
|
38
|
+
"$schema",
|
|
39
|
+
"description",
|
|
40
|
+
]);
|
|
30
41
|
const ProjectConsolidateMW = async (ctx, next) => {
|
|
31
42
|
if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
|
|
32
43
|
next();
|
|
@@ -79,12 +90,13 @@ async function upgrade(ctx, next, showModal) {
|
|
|
79
90
|
throw error;
|
|
80
91
|
}
|
|
81
92
|
}
|
|
82
|
-
// check if
|
|
93
|
+
// check if manifest.template.json exist
|
|
83
94
|
async function needConsolidateLocalRemote(ctx) {
|
|
84
95
|
if (!tools_1.isConfigUnifyEnabled()) {
|
|
85
96
|
return false;
|
|
86
97
|
}
|
|
87
|
-
const
|
|
98
|
+
const lastArg = ctx.arguments[ctx.arguments.length - 1];
|
|
99
|
+
const inputs = lastArg === ctx ? ctx.arguments[ctx.arguments.length - 2] : lastArg;
|
|
88
100
|
if (!inputs.projectPath) {
|
|
89
101
|
return false;
|
|
90
102
|
}
|
|
@@ -92,9 +104,8 @@ async function needConsolidateLocalRemote(ctx) {
|
|
|
92
104
|
if (!fxExist) {
|
|
93
105
|
return false;
|
|
94
106
|
}
|
|
95
|
-
const localEnvExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, ".fx", "configs", "config.local.json"));
|
|
96
107
|
const consolidateManifestExist = await fs_extra_1.default.pathExists(path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.template.json"));
|
|
97
|
-
if (!
|
|
108
|
+
if (!consolidateManifestExist) {
|
|
98
109
|
return true;
|
|
99
110
|
}
|
|
100
111
|
return false;
|
|
@@ -102,7 +113,8 @@ async function needConsolidateLocalRemote(ctx) {
|
|
|
102
113
|
exports.needConsolidateLocalRemote = needConsolidateLocalRemote;
|
|
103
114
|
function outputCancelMessage(ctx) {
|
|
104
115
|
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade cancelled.`);
|
|
105
|
-
const
|
|
116
|
+
const lastArg = ctx.arguments[ctx.arguments.length - 1];
|
|
117
|
+
const inputs = lastArg === ctx ? ctx.arguments[ctx.arguments.length - 2] : lastArg;
|
|
106
118
|
if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
|
|
107
119
|
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version Teams Toolkit, please find Teams Toolkit in Extension and install the version <= 3.7.0`);
|
|
108
120
|
}
|
|
@@ -113,7 +125,8 @@ function outputCancelMessage(ctx) {
|
|
|
113
125
|
}
|
|
114
126
|
async function consolidateLocalRemote(ctx) {
|
|
115
127
|
telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateUpgradeStart);
|
|
116
|
-
const
|
|
128
|
+
const lastArg = ctx.arguments[ctx.arguments.length - 1];
|
|
129
|
+
const inputs = lastArg === ctx ? ctx.arguments[ctx.arguments.length - 2] : lastArg;
|
|
117
130
|
const fileList = [];
|
|
118
131
|
const removeMap = new Map();
|
|
119
132
|
const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs, true);
|
|
@@ -147,12 +160,18 @@ async function consolidateLocalRemote(ctx) {
|
|
|
147
160
|
if ((manifest === null || manifest === void 0 ? void 0 : manifest.staticTabs) && manifest.staticTabs.length > 0) {
|
|
148
161
|
manifest.staticTabs.forEach((item) => {
|
|
149
162
|
componentId = item.entityId;
|
|
163
|
+
if ((item.contentUrl && componentId === undefined) || componentId === "") {
|
|
164
|
+
componentId = replaceSPFxComponentId(item.contentUrl);
|
|
165
|
+
}
|
|
150
166
|
const contentUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
|
|
151
167
|
item.contentUrl = contentUrl;
|
|
152
168
|
});
|
|
153
169
|
}
|
|
154
170
|
if ((manifest === null || manifest === void 0 ? void 0 : manifest.configurableTabs) && manifest.configurableTabs.length > 0) {
|
|
155
171
|
manifest.configurableTabs.forEach((item) => {
|
|
172
|
+
if ((item.configurationUrl && componentId === undefined) || componentId === "") {
|
|
173
|
+
componentId = replaceSPFxComponentId(item.configurationUrl);
|
|
174
|
+
}
|
|
156
175
|
const configurationUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
|
|
157
176
|
item.configurationUrl = configurationUrl;
|
|
158
177
|
});
|
|
@@ -180,6 +199,9 @@ async function consolidateLocalRemote(ctx) {
|
|
|
180
199
|
removeMap.set(path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), localSettingsFile);
|
|
181
200
|
}
|
|
182
201
|
const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
|
|
202
|
+
if ((await fs_extra_1.default.pathExists(localManifestFile)) && (await fs_extra_1.default.pathExists(remoteManifestFile))) {
|
|
203
|
+
await compareLocalAndRemoteManifest(localManifestFile, remoteManifestFile);
|
|
204
|
+
}
|
|
183
205
|
if (await fs_extra_1.default.pathExists(localManifestFile)) {
|
|
184
206
|
await fs_extra_1.default.copy(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
|
|
185
207
|
await fs_extra_1.default.remove(localManifestFile);
|
|
@@ -245,4 +267,65 @@ async function generateUpgradeReport(backupFolder) {
|
|
|
245
267
|
// do nothing
|
|
246
268
|
}
|
|
247
269
|
}
|
|
270
|
+
function replaceSPFxComponentId(content) {
|
|
271
|
+
const match = componentIdRegex.exec(content);
|
|
272
|
+
if (match) {
|
|
273
|
+
return match[0];
|
|
274
|
+
}
|
|
275
|
+
return "";
|
|
276
|
+
}
|
|
277
|
+
async function compareLocalAndRemoteManifest(localManifestFile, remoteManifestFile) {
|
|
278
|
+
try {
|
|
279
|
+
const localManifestString = (await fs_extra_1.default.readFile(localManifestFile))
|
|
280
|
+
.toString()
|
|
281
|
+
.replace(manifestRegex, "");
|
|
282
|
+
const remoteManifestString = (await fs_extra_1.default.readFile(remoteManifestFile))
|
|
283
|
+
.toString()
|
|
284
|
+
.replace(manifestRegex, "");
|
|
285
|
+
const localManifestJson = JSON.parse(localManifestString);
|
|
286
|
+
const remoteManifestJson = JSON.parse(remoteManifestString);
|
|
287
|
+
if (!diff(localManifestJson, remoteManifestJson)) {
|
|
288
|
+
notifyToUpdateManifest();
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
catch (error) {
|
|
292
|
+
telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateCheckManifestError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
async function notifyToUpdateManifest() {
|
|
296
|
+
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.DifferentManifest"), false, "OK", LearnMore));
|
|
297
|
+
const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
|
|
298
|
+
if (answer === LearnMore) {
|
|
299
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.openUrl(UnifyManifestLearMoreLink);
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
function diff(a, b) {
|
|
303
|
+
const keys = Object.keys(a);
|
|
304
|
+
const bKeys = Object.keys(b);
|
|
305
|
+
if (keys.length != bKeys.length) {
|
|
306
|
+
return false;
|
|
307
|
+
}
|
|
308
|
+
let aValue, bValue, key;
|
|
309
|
+
for (key of keys) {
|
|
310
|
+
if (ignoreKeys.has(key)) {
|
|
311
|
+
continue;
|
|
312
|
+
}
|
|
313
|
+
aValue = a[key];
|
|
314
|
+
bValue = b[key];
|
|
315
|
+
if (isObject(aValue) && isObject(bValue)) {
|
|
316
|
+
if (!diff(aValue, bValue)) {
|
|
317
|
+
return false;
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
else {
|
|
321
|
+
if (aValue !== bValue) {
|
|
322
|
+
return false;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
return true;
|
|
327
|
+
}
|
|
328
|
+
function isObject(o) {
|
|
329
|
+
return typeof o === "object" && !!o;
|
|
330
|
+
}
|
|
248
331
|
//# sourceMappingURL=consolidateLocalRemote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"consolidateLocalRemote.js","sourceRoot":"","sources":["../../../src/core/middleware/consolidateLocalRemote.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,8 +81,9 @@ async function _saveEnvFile(envPath, envs, configs) {
|
|
|
81
81
|
customizedRemoteEnvs: Object.assign(Object.assign({}, configs.customizedRemoteEnvs), envs.customizedRemoteEnvs),
|
|
82
82
|
};
|
|
83
83
|
if (utils_1.Utils.isKvPairEqual(newConfigs.teamsfxRemoteEnvs, configs.teamsfxRemoteEnvs) &&
|
|
84
|
-
utils_1.Utils.isKvPairEqual(newConfigs.customizedRemoteEnvs, configs.customizedRemoteEnvs)
|
|
85
|
-
|
|
84
|
+
utils_1.Utils.isKvPairEqual(newConfigs.customizedRemoteEnvs, configs.customizedRemoteEnvs) &&
|
|
85
|
+
(await fs_extra_1.default.pathExists(envPath))) {
|
|
86
|
+
// Avoid updating dotenv file's modified time if path already exists and nothing changes.
|
|
86
87
|
// We decide whether to skip deployment by comparing the mtime of all project files and last deployment time.
|
|
87
88
|
return;
|
|
88
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../src/plugins/resource/frontend/env.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../src/plugins/resource/frontend/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuestions.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACJ,OAAO,EACP,MAAM,EAMN,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACH,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"getQuestions.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACJ,OAAO,EACP,MAAM,EAMN,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACH,MAAM,wBAAwB,CAAC;AAwDhC,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA+GjD;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA+CjD;AAaD,wBAAsB,YAAY,CAChC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CA0JjD;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAkBjD;AAED,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAiLjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAgDjD"}
|
|
@@ -71,7 +71,7 @@ async function getQuestionsForScaffolding(ctx, inputs) {
|
|
|
71
71
|
node.condition = { containsAny: [question_1.TabOptionItem.id, question_1.BotOptionItem.id, question_1.MessageExtensionItem.id] };
|
|
72
72
|
}
|
|
73
73
|
// 1.1.2 Azure Tab
|
|
74
|
-
const tabRes = await getTabScaffoldQuestionsV2(ctx, inputs, !featureFlags_1.
|
|
74
|
+
const tabRes = await getTabScaffoldQuestionsV2(ctx, inputs, !featureFlags_1.isPreviewFeaturesEnabled() && teamsfx_api_1.CLIPlatforms.includes(inputs.platform) // only CLI and CLI_HELP support azure-resources question
|
|
75
75
|
);
|
|
76
76
|
if (tabRes.isErr())
|
|
77
77
|
return tabRes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getQuestions.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/getQuestions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "1.8.0-rc.
|
|
3
|
+
"version": "1.8.0-rc.4",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -184,7 +184,7 @@
|
|
|
184
184
|
"resource/**/*",
|
|
185
185
|
"templates/**/*"
|
|
186
186
|
],
|
|
187
|
-
"gitHead": "
|
|
187
|
+
"gitHead": "7c45d298987076ca50a9e18bbaf7004cec95d678",
|
|
188
188
|
"publishConfig": {
|
|
189
189
|
"access": "public"
|
|
190
190
|
},
|
|
@@ -47,6 +47,7 @@
|
|
|
47
47
|
"core.migrationToArmAndMultiEnv.ErrorMessage": "Upgrade Failed. Please check the error message in Output window to troubleshoot and fix. You can also click Learn More for the FAQ and how to upgrade manually.",
|
|
48
48
|
"core.migrationToArmAndMultiEnv.PreCheckErrorMessage": "Upgrade Failed. '%s' doesn't exist or is not in json format. Please fix it and try again by running command (Teams: Upgrade project).\nYou can also click Learn More for the FAQ.",
|
|
49
49
|
"core.consolidateLocalRemote.Message": "Your project will be upgraded to work with the latest version of Teams Toolkit. The upgrade will only backup and change the local config and manifest template file without changing your custom code. If you want to skip auto-upgrade, please install older version of Teams Toolkit (<=3.7.0)",
|
|
50
|
+
"core.consolidateLocalRemote.DifferentManifest": "Since Teams Toolkit will use manifest.remote.template.json as a single manifest template file after the upgrade and we detected you may have customized the manifest.local.template.json, you may need to update the manifest.template.json to include your change. See Learn More for details.",
|
|
50
51
|
"core.consolidateLocalRemote.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for local debug and manifest.template.json for both Teams app running locally and remotely. And we have backed up localSettings.json, manifest.local.template.json and manifest.remote.template.json to .backup folder.",
|
|
51
52
|
"core.aadManifestMigration.Canceled": "[core] Upgrade cancelled.",
|
|
52
53
|
"core.aadManifestMigration.VSCodeCanceledNotice": "[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version Teams Toolkit, please find Teams Toolkit in Extension and install the version <= ????",
|
|
@@ -17,7 +17,9 @@ After the project upgrade, the new file structure will consist:
|
|
|
17
17
|
Your existing `localSettings.json`, `manifest.local.template.json`, and `manifest.remote.template.json` files will be backed up in `.backup` folder.
|
|
18
18
|
|
|
19
19
|
## Know what you need to do
|
|
20
|
-
Since Teams Toolkit will use `manifest.remote.template.json` as a single manifest template file after the upgrade, if you have customized the `manifest.local.template.json
|
|
20
|
+
Since Teams Toolkit will use `manifest.remote.template.json` as a single manifest template file after the upgrade, if you have customized the `manifest.local.template.json`, you will need to update the `manifest.template.json` to include your change.
|
|
21
|
+
|
|
22
|
+
For how to update the `manifest.template.json`, you can check this [Wiki Page](https://aka.ms/teamsfx-unify-local-remote-manifest-guide).
|
|
21
23
|
|
|
22
24
|
## Know about how to restore your project
|
|
23
25
|
If anything went wrong after the upgrade process, you could restore your old project configuration files by:
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|