@microsoft/teamsfx-core 1.3.1-alpha.e749ebc2.0 → 1.4.0

package/build/plugins/solution/fx-solution/debug/util/tasksNext.js

@@ -9,24 +9,27 @@ const constants_1 = require("../../../../../common/local/constants");
 function generateTasks(includeFrontend, includeBackend, includeBot, programmingLanguage) {
     /**
      * Referenced by launch.json
-     *   - Pre Debug Check
-     *   - Start Frontend
-     *   - Start Backend
-     *   - Start Bot
+     *   - Pre Debug Check & Start All
      *
      * Referenced inside tasks.json
      *   - validate local prerequisites
      *   - start ngrok
      *   - prepare local environment
+     *   - Start All
+     *   - Start Frontend
+     *   - Start Backend
+     *   - Watch Backend
+     *   - Start Bot
      */
     const tasks = [
-        preDebugCheck(includeBot),
+        preDebugCheckAndStartAll(includeBot),
         validateLocalPrerequisites(),
     ];
     if (includeBot) {
         tasks.push(startNgrok());
     }
     tasks.push(prepareLocalEnvironment());
+    tasks.push(startAll(includeFrontend, includeBackend, includeBot));
     if (includeFrontend) {
         tasks.push(startFrontend());
         if (includeBackend) {
@@ -42,12 +45,12 @@ function generateTasks(includeFrontend, includeBackend, includeBot, programmingL
     return tasks;
 }
 exports.generateTasks = generateTasks;
-function preDebugCheck(includeBot) {
+function preDebugCheckAndStartAll(includeBot) {
     return {
-        label: "Pre Debug Check",
+        label: "Pre Debug Check & Start All",
         dependsOn: includeBot
-            ? ["validate local prerequisites", "start ngrok", "prepare local environment"]
-            : ["validate local prerequisites", "prepare local environment"],
+            ? ["validate local prerequisites", "start ngrok", "prepare local environment", "Start All"]
+            : ["validate local prerequisites", "prepare local environment", "Start All"],
         dependsOrder: "sequence",
     };
 }
@@ -126,7 +129,21 @@ function startBot(includeFrontend) {
         type: "shell",
         command: "npm run dev:teamsfx",
         isBackground: true,
-        problemMatcher: "$teamsfx-bot-watch",
+        problemMatcher: {
+            pattern: [
+                {
+                    regexp: "^.*$",
+                    file: 0,
+                    location: 1,
+                    message: 2,
+                },
+            ],
+            background: {
+                activeOnStart: true,
+                beginsPattern: "[nodemon] starting",
+                endsPattern: "restify listening to|Bot/ME service listening at|[nodemon] app crashed",
+            },
+        },
         options: {
             cwd: "${workspaceFolder}/bot",
         },
@@ -142,4 +159,20 @@ function startNgrok() {
         dependsOn: `${teamsfx_api_1.ProductName}: ngrok start`,
     };
 }
+function startAll(includeFrontend, includeBackend, includeBot) {
+    const dependsOn = [];
+    if (includeFrontend) {
+        dependsOn.push("Start Frontend");
+    }
+    if (includeBackend) {
+        dependsOn.push("Start Backend");
+    }
+    if (includeBot) {
+        dependsOn.push("Start Bot");
+    }
+    return {
+        label: "Start All",
+        dependsOn,
+    };
+}
 //# sourceMappingURL=tasksNext.js.map

package/build/plugins/solution/fx-solution/debug/util/tasksNext.js.map

@@ -1 +1 @@
-{"version":3,"file":"tasksNext.js","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasksNext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tasksNext.js","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasksNext.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.3.1-alpha.e749ebc2.0",
+  "version": "1.4.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -59,7 +59,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "0.14.1-alpha.e749ebc2.0",
+    "@microsoft/teamsfx-api": "^0.15.0",
     "@npmcli/arborist": "^4.2.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
@@ -181,7 +181,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "e3f58ffcc850ad5ba20373007be32ead5154d65a",
+  "gitHead": "b0bab4f74d78f91214e2712f3fb19b0e48936846",
   "publishConfig": {
     "access": "public"
   },