npm - @microsoft/teamsfx-core - Versions diffs - 1.8.0-rc.2 → 1.8.0 - Mend

@microsoft/teamsfx-core 1.8.0-rc.2 → 1.8.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.

Files changed (53) hide show

package/build/common/samples-config.json CHANGED Viewed

@@ -136,20 +136,6 @@
             "time": "5min to run",
             "configuration": "Ready for local debug",
             "suggested": false
-        },
-        {
-            "id": "bot-proactive-messaging-teamsfx",
-            "title": "Proactive Messaging",
-            "shortDescription": "Demonstrates how to send proactive messages to users.",
-            "fullDescription": "This is a sample which shows how to save user's conversation reference information to send proactive reminder message using Bots.",
-            "tags": [
-                "Bot", "JS"
-            ],
-            "time": "5min to run",
-            "configuration": "Ready for local debug",
-            "suggested": false,
-            "url": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/",
-            "packageLink": "https://github.com/OfficeDev/Microsoft-Teams-Samples/archive/refs/heads/main.zip"
         }
     ]
 }

package/build/common/samples.js CHANGED Viewed

@@ -7,7 +7,6 @@ class SampleProvider {
     get SampleCollection() {
         if (!this.sampleCollection) {
             const samples = samples_config_json_1.default.samples.map((sample) => {
-                var _a, _b;
                 return {
                     id: sample.id,
                     title: sample.title,
@@ -16,9 +15,9 @@ class SampleProvider {
                     tags: sample.tags,
                     time: sample.time,
                     configuration: sample.configuration,
-                    link: (_a = sample.packageLink) !== null && _a !== void 0 ? _a : samples_config_json_1.default.defaultPackageLink,
+                    link: samples_config_json_1.default.defaultPackageLink,
                     suggested: sample.suggested,
-                    url: (_b = sample.url) !== null && _b !== void 0 ? _b : samples_config_json_1.default.baseUrl,
+                    url: samples_config_json_1.default.baseUrl,
                 };
             });
             this.sampleCollection = {

package/build/common/samples.js.map CHANGED Viewed

	@@ -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;;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,~~MAAA,MAAM,CAAC,WAAW,mCAAI,~~6BAAY,CAAC,kBAAkB;~~oBAC3D~~,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,GAAG,EAAE,~~MAAA,MAAM,CAAC,GAAG,mCAAI,~~6BAAY,CAAC,OAAO;~~iBAC1B~~,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"}
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"}

package/build/common/telemetry.d.ts CHANGED Viewed

@@ -72,6 +72,7 @@ export declare enum TelemetryEvent {
     ProjectConsolidateGuideStart = "project-Consolidate-guide-start",
     ProjectConsolidateGuide = "project-consolidate-guide",
     ProjectConsolidateError = "project-consolidate-error",
+    ProjectConsolidateCheckManifestError = "project-consolidate-check-manifest-error",
     DetectPortStart = "detect-port-start",
     DetectPort = "detect-port"
 }

package/build/common/telemetry.d.ts.map CHANGED Viewed

	@@ -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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"}

package/build/common/telemetry.js CHANGED Viewed

@@ -79,6 +79,7 @@ var TelemetryEvent;
     TelemetryEvent["ProjectConsolidateGuideStart"] = "project-Consolidate-guide-start";
     TelemetryEvent["ProjectConsolidateGuide"] = "project-consolidate-guide";
     TelemetryEvent["ProjectConsolidateError"] = "project-consolidate-error";
+    TelemetryEvent["ProjectConsolidateCheckManifestError"] = "project-consolidate-check-manifest-error";
     TelemetryEvent["DetectPortStart"] = "detect-port-start";
     TelemetryEvent["DetectPort"] = "detect-port";
 })(TelemetryEvent = exports.TelemetryEvent || (exports.TelemetryEvent = {}));

package/build/common/telemetry.js.map CHANGED Viewed

	@@ -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,~~cAmDX~~;~~AAnDD~~,WAAY,cAAc;IACxB,+DAA6C,CAAA;IAC7C,oDAAkC,CAAA;IAClC,oDAAkC,CAAA;IAClC,+DAA6C,CAAA;IAC7C,wCAAsB,CAAA;IACtB,sDAAoC,CAAA;IACpC,wEAAsD,CAAA;IACtD,6DAA2C,CAAA;IAC3C,wDAAsC,CAAA;IACtC,0CAAwB,CAAA;IACxB,0FAAwE,CAAA;IACxE,+EAA6D,CAAA;IAC7D,gFAA8D,CAAA;IAC9D,qEAAmD,CAAA;IACnD,uFAAqE,CAAA;IACrE,4EAA0D,CAAA;IAC1D,kGAAgF,CAAA;IAChF,uFAAqE,CAAA;IACrE,4EAA0D,CAAA;IAC1D,iEAA+C,CAAA;IAC/C,qFAAmE,CAAA;IACnE,iEAA+C,CAAA;IAC/C,yGAAuF,CAAA;IACvF,2FAAyE,CAAA;IACzE,2FAAyE,CAAA;IACzE,0HAAwG,CAAA;IACxG,+GAA6F,CAAA;IAC7F,8HAA4G,CAAA;IAC5G,mHAAiG,CAAA;IACjG,kGAAgF,CAAA;IAChF,6FAA2E,CAAA;IAC3E,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,sFAAoE,CAAA;IACpE,2EAAyD,CAAA;IACzD,gGAA8E,CAAA;IAC9E,qFAAmE,CAAA;IACnE,wGAAsF,CAAA;IACtF,6FAA2E,CAAA;IAC3E,4GAA0F,CAAA;IAC1F,iGAA+E,CAAA;IAC/E,0GAAwF,CAAA;IACxF,+FAA6E,CAAA;IAC7E,iGAA+E,CAAA;IAC/E,sFAAoE,CAAA;IACpE,kFAAgE,CAAA;IAChE,uEAAqD,CAAA;IACrD,uEAAqD,CAAA;IACrD,uDAAqC,CAAA;IACrC,4CAA0B,CAAA;AAC5B,CAAC,~~EAnDW~~,cAAc,GAAd,sBAAc,KAAd,sBAAc,~~QAmDzB~~;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,6BAAS,CAAA;AACX,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,wCAAkB,CAAA;IAClB,4CAAsB,CAAA;AACxB,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,wBAAW,CAAA;IACX,sBAAS,CAAA;IACT,0BAAa,CAAA;IACb,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAED,IAAY,0BAQX;AARD,WAAY,0BAA0B;IACpC,0DAA4B,CAAA;IAC5B,sDAAwB,CAAA;IACxB,oDAAsB,CAAA;IACtB,qFAAuD,CAAA;IACvD,2FAA6D,CAAA;IAC7D,iFAAmD,CAAA;IACnD,kEAAoC,CAAA;AACtC,CAAC,EARW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAQrC;AAED,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,kCAAS,CAAA;IACT,0CAAiB,CAAA;AACnB,CAAC,EAHW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAGhC;AAED,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IACpC,+CAAiB,CAAA;IACjB,sDAAwB,CAAA;IACxB,+CAAiB,CAAA;AACnB,CAAC,EAJW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAIrC;AAED,SAAgB,kBAAkB,CAChC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;;IAEtC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,kBAAkB,CAC7D,SAAS,EACT,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;AAfD,gDAeC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC5D,IAAI,OAAO,YAAY,uBAAS,EAAE;QAChC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC;KACxE;SAAM;QACL,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC;KAC1E;IAED,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAC9E,UAAU,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,GAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EACjD,EAAE,CAAC;IAEH,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC;AAvBD,0DAuBC"}
1	+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"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"}

package/build/common/templates-config.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-    "version": "0.0.0-rc",
+    "version": "^0.7.0",
     "tagPrefix": "templates@",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",

package/build/core/middleware/concurrentLocker.d.ts.map CHANGED Viewed

	@@ -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,~~UAiFhC~~,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAKzD"}
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"}

package/build/core/middleware/concurrentLocker.js CHANGED Viewed

@@ -18,6 +18,7 @@ const os = tslib_1.__importStar(require("os"));
 const tools_1 = require("../../common/tools");
 let doingTask = undefined;
 const ConcurrentLockerMW = async (ctx, next) => {
+    var _a, _b;
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     if (projectSettingsLoader_1.shouldIgnored(ctx)) {
         await next();
@@ -78,7 +79,13 @@ const ConcurrentLockerMW = async (ctx, next) => {
         }
     }
     if (!acquired) {
-        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.error(`[core] failed to acquire lock for task ${taskName} on: ${configFolder}`);
+        const log = `[core] failed to acquire lock for task ${taskName} on: ${configFolder}`;
+        if (inputs.loglevel && inputs.loglevel === "Debug") {
+            (_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);
+        }
+        else {
+            (_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);
+        }
         // failed for 10 times and finally failed
         telemetry_1.sendTelemetryErrorEvent(error_1.CoreSource, "concurrent-operation", new teamsfx_api_1.ConcurrentError(error_1.CoreSource), {
             retry: retryNum + "",

package/build/core/middleware/concurrentLocker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"concurrentLocker.js","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"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~~CAAC~~,KAAK,~~CACtB~~,~~0CAA0C~~,~~QAAQ~~,~~QAAQ~~,~~YAAY~~,~~EAAE~~,~~CACzE~~,CAAC;~~QACF~~,yCAAyC;QACzC,mCAAuB,CAAC,kBAAU,EAAE,sBAAsB,EAAE,IAAI,6BAAe,CAAC,kBAAU,CAAC,EAAE;YAC3F,KAAK,EAAE,QAAQ,GAAG,EAAE;YACpB,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,SAAS,IAAI,EAAE;YACtB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,IAAI,6BAAe,CAAC,kBAAU,CAAC,CAAC,CAAC;KACnD;AACH,CAAC,CAAC;~~AAjFW~~,QAAA,kBAAkB,~~sBAiF7B~~;AAEF,SAAgB,aAAa,CAAC,WAAmB;IAC/C,OAAO,IAAI,CAAC,IAAI,CACd,EAAE,CAAC,MAAM,EAAE,EACX,GAAG,yBAAW,IAAI,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC/E,CAAC;AACJ,CAAC;AALD,sCAKC"}
1	+ {"version":3,"file":"concurrentLocker.js","sourceRoot":"","sources":["../../../src/core/middleware/concurrentLocker.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/consolidateLocalRemote.d.ts.map CHANGED Viewed

	@@ -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;~~AAkB3C~~,eAAO,MAAM,oBAAoB,EAAE,UAqBlC,CAAC;AA2CF,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBvF"}
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"}

package/build/core/middleware/consolidateLocalRemote.js CHANGED Viewed

@@ -23,10 +23,21 @@ const constants_1 = require("../../plugins/resource/spfx/utils/constants");
 const upgradeButton = "Upgrade";
 const LearnMore = "Learn More";
 const LearnMoreLink = "https://aka.ms/teamsfx-unify-config-guide";
+const UnifyManifestLearMoreLink = "https://aka.ms/teamsfx-unify-local-remote-manifest-guide";
 let userCancelFlag = false;
 const backupFolder = ".backup";
 const methods = new Set(["getProjectConfig", "checkPermission"]);
 const upgradeReportName = "unify-config-change-logs.md";
+const componentIdRegex = /(?<=componentId=)([a-z0-9-]*)(?=%26)/;
+const manifestRegex = /{{{.*}}}|{{.*}}|{.*}/g;
+const ignoreKeys = new Set([
+    "name",
+    "contentUrl",
+    "configurationUrl",
+    "manifestVersion",
+    "$schema",
+    "description",
+]);
 const ProjectConsolidateMW = async (ctx, next) => {
     if (await projectMigrator_1.needMigrateToArmAndMultiEnv(ctx)) {
         next();
@@ -149,12 +160,18 @@ async function consolidateLocalRemote(ctx) {
                 if ((manifest === null || manifest === void 0 ? void 0 : manifest.staticTabs) && manifest.staticTabs.length > 0) {
                     manifest.staticTabs.forEach((item) => {
                         componentId = item.entityId;
+                        if ((item.contentUrl && componentId === undefined) || componentId === "") {
+                            componentId = replaceSPFxComponentId(item.contentUrl);
+                        }
                         const contentUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONTENT_URL, componentId, componentId);
                         item.contentUrl = contentUrl;
                     });
                 }
                 if ((manifest === null || manifest === void 0 ? void 0 : manifest.configurableTabs) && manifest.configurableTabs.length > 0) {
                     manifest.configurableTabs.forEach((item) => {
+                        if ((item.configurationUrl && componentId === undefined) || componentId === "") {
+                            componentId = replaceSPFxComponentId(item.configurationUrl);
+                        }
                         const configurationUrl = util.format(constants_1.ManifestTemplate.REMOTE_CONFIGURATION_URL, componentId, componentId);
                         item.configurationUrl = configurationUrl;
                     });
@@ -182,6 +199,9 @@ async function consolidateLocalRemote(ctx) {
             removeMap.set(path_1.default.join(backupPath, ".fx", "configs", "localSettings.json"), localSettingsFile);
         }
         const localManifestFile = path_1.default.join(inputs.projectPath, "templates", "appPackage", "manifest.local.template.json");
+        if ((await fs_extra_1.default.pathExists(localManifestFile)) && (await fs_extra_1.default.pathExists(remoteManifestFile))) {
+            await compareLocalAndRemoteManifest(localManifestFile, remoteManifestFile);
+        }
         if (await fs_extra_1.default.pathExists(localManifestFile)) {
             await fs_extra_1.default.copy(localManifestFile, path_1.default.join(backupPath, "templates", "appPackage", "manifest.local.template.json"), { overwrite: true });
             await fs_extra_1.default.remove(localManifestFile);
@@ -247,4 +267,65 @@ async function generateUpgradeReport(backupFolder) {
         // do nothing
     }
 }
+function replaceSPFxComponentId(content) {
+    const match = componentIdRegex.exec(content);
+    if (match) {
+        return match[0];
+    }
+    return "";
+}
+async function compareLocalAndRemoteManifest(localManifestFile, remoteManifestFile) {
+    try {
+        const localManifestString = (await fs_extra_1.default.readFile(localManifestFile))
+            .toString()
+            .replace(manifestRegex, "");
+        const remoteManifestString = (await fs_extra_1.default.readFile(remoteManifestFile))
+            .toString()
+            .replace(manifestRegex, "");
+        const localManifestJson = JSON.parse(localManifestString);
+        const remoteManifestJson = JSON.parse(remoteManifestString);
+        if (!diff(localManifestJson, remoteManifestJson)) {
+            notifyToUpdateManifest();
+        }
+    }
+    catch (error) {
+        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectConsolidateCheckManifestError, teamsfx_api_1.assembleError(error, error_1.CoreSource));
+    }
+}
+async function notifyToUpdateManifest() {
+    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));
+    const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
+    if (answer === LearnMore) {
+        globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.openUrl(UnifyManifestLearMoreLink);
+    }
+}
+function diff(a, b) {
+    const keys = Object.keys(a);
+    const bKeys = Object.keys(b);
+    if (keys.length != bKeys.length) {
+        return false;
+    }
+    let aValue, bValue, key;
+    for (key of keys) {
+        if (ignoreKeys.has(key)) {
+            continue;
+        }
+        aValue = a[key];
+        bValue = b[key];
+        if (isObject(aValue) && isObject(bValue)) {
+            if (!diff(aValue, bValue)) {
+                return false;
+            }
+        }
+        else {
+            if (aValue !== bValue) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+function isObject(o) {
+    return typeof o === "object" && !!o;
+}
 //# sourceMappingURL=consolidateLocalRemote.js.map

package/build/core/middleware/consolidateLocalRemote.js.map CHANGED Viewed

	@@ -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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"}

package/build/plugins/resource/frontend/env.js CHANGED Viewed

@@ -81,8 +81,9 @@ async function _saveEnvFile(envPath, envs, configs) {
         customizedRemoteEnvs: Object.assign(Object.assign({}, configs.customizedRemoteEnvs), envs.customizedRemoteEnvs),
     };
     if (utils_1.Utils.isKvPairEqual(newConfigs.teamsfxRemoteEnvs, configs.teamsfxRemoteEnvs) &&
-        utils_1.Utils.isKvPairEqual(newConfigs.customizedRemoteEnvs, configs.customizedRemoteEnvs)) {
-        // Avoid updating dotenv file's modified time if nothing changes.
+        utils_1.Utils.isKvPairEqual(newConfigs.customizedRemoteEnvs, configs.customizedRemoteEnvs) &&
+        (await fs_extra_1.default.pathExists(envPath))) {
+        // Avoid updating dotenv file's modified time if path already exists and nothing changes.
         // We decide whether to skip deployment by comparing the mtime of all project files and last deployment time.
         return;
     }

package/build/plugins/resource/frontend/env.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../src/plugins/resource/frontend/env.ts"],"names":[],"mappings":"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~~EAClF~~;QACA,~~iEAAiE~~;~~QACjE~~,6GAA6G;QAC7G,OAAO;KACR;IAED,MAAM,kBAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE7B,MAAM,SAAS,GACb,iDAAiD,EAAE,CAAC,GAAG,EAAE;QACzD,eAAe,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAC7C,GAAG,EAAE,CAAC,GAAG,mEAAmE,EAAE,CAAC,GAAG,EAAE;QACpF,YAAY,EAAE,CAAC,GAAG,EAAE;QACpB,eAAe,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAEnD,MAAM,kBAAE,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,IAA+B;IACtD,OAAO,CACL,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACjB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;SAC5B,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CACzB,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../../../../src/plugins/resource/frontend/env.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.8.0-rc.2",
+  "version": "1.8.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -65,7 +65,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.18.0-rc.0",
+    "@microsoft/teamsfx-api": "^0.18.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -184,7 +184,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "f08e93a372f2ece2f59c237dfa074ed4f608681b",
+  "gitHead": "56ae503e2f0d6c13a62f991b6a3deb38d1183aed",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json CHANGED Viewed

@@ -47,6 +47,7 @@
   "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.",
   "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.",
   "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)",
+  "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.",
   "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.",
   "core.aadManifestMigration.Canceled": "[core] Upgrade cancelled.",
   "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 <= ????",

package/resource/unify-config-change-logs.md CHANGED Viewed

@@ -17,7 +17,9 @@ After the project upgrade, the new file structure will consist:
 Your existing `localSettings.json`, `manifest.local.template.json`, and `manifest.remote.template.json` files will be backed up in `.backup` folder.
 ## Know what you need to do
-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 place your changes in `config.local.json` and pass it to the template.
+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.
+For how to update the `manifest.template.json`, you can check this [Wiki Page](https://aka.ms/teamsfx-unify-local-remote-manifest-guide).
 ## Know about how to restore your project
 If anything went wrong after the upgrade process, you could restore your old project configuration files by: