chore: teamsFX upgrade

eea · Oct 26, 2023 · cabde1a · cabde1a
1 parent 03129cf
commit cabde1a
Show file tree

Hide file tree

Showing 25 changed files with 2,409 additions and 1,721 deletions.
diff --git a/.fx/configs/azure.parameters.Prod_EEA.json b/.fx/configs/azure.parameters.Prod_EEA.json
diff --git a/.fx/configs/azure.parameters.dev.json b/.fx/configs/azure.parameters.dev.json
diff --git a/.fx/configs/config.Prod_EEA.json b/.fx/configs/config.Prod_EEA.json
diff --git a/.fx/configs/config.dev.json b/.fx/configs/config.dev.json
diff --git a/.fx/configs/projectSettings.json b/.fx/configs/projectSettings.json
diff --git a/.fx/states/state.Prod_EEA.json b/.fx/states/state.Prod_EEA.json
diff --git a/.fx/states/state.dev.json b/.fx/states/state.dev.json
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,8 @@ subscriptionInfo.json
 build
 .fx/configs/config.local.json
 .fx/states/state.local.json
-.backup
+.backup
+env/.env.*.user
+env/.env.local
+.backup/*
+/devTools/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,7 +5,7 @@
             "name": "Launch Remote (Edge)",
             "type": "pwa-msedge",
             "request": "launch",
-            "url": "https://teams.microsoft.com/l/app/${teamsAppId}?installAppPackage=true&webjoin=true&${account-hint}",
+            "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
                 "group": "remote",
                 "order": 2
@@ -15,7 +15,7 @@
             "name": "Launch Remote (Chrome)",
             "type": "pwa-chrome",
             "request": "launch",
-            "url": "https://teams.microsoft.com/l/app/${teamsAppId}?installAppPackage=true&webjoin=true&${account-hint}",
+            "url": "https://teams.microsoft.com/l/app/${{TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "presentation": {
                 "group": "remote",
                 "order": 1
@@ -25,7 +25,7 @@
             "name": "Attach to Frontend (Edge)",
             "type": "pwa-msedge",
             "request": "launch",
-            "url": "https://teams.microsoft.com/l/app/${localTeamsAppId}?installAppPackage=true&webjoin=true&${account-hint}",
+            "url": "https://teams.microsoft.com/l/app/${{local:TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "cascadeTerminateToConfigurations": [
                 "Attach to Backend"
             ],
@@ -38,7 +38,7 @@
             "name": "Attach to Frontend (Chrome)",
             "type": "pwa-chrome",
             "request": "launch",
-            "url": "https://teams.microsoft.com/l/app/${localTeamsAppId}?installAppPackage=true&webjoin=true&${account-hint}",
+            "url": "https://teams.microsoft.com/l/app/${{local:TEAMS_APP_ID}}?installAppPackage=true&webjoin=true&${account-hint}",
             "cascadeTerminateToConfigurations": [
                 "Attach to Backend"
             ],

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -11,19 +11,53 @@
             "dependsOrder": "sequence"
         },
         {
+            // Check if all required prerequisites are installed and will install them if not.
+            // See https://aka.ms/teamsfx-check-prerequisites-task to know the details and how to customize the args.
             "label": "validate local prerequisites",
-            "type": "shell",
-            "command": "exit ${command:fx-extension.validate-local-prerequisites}",
+            "type": "teamsfx",
+            "command": "debug-check-prerequisites",
             "presentation": {
                 "reveal": "never"
+            },
+            "args": {
+                "prerequisites": [
+                    "nodejs", // Validate if Node.js is installed.
+                    "m365Account", // Sign-in prompt for Microsoft 365 account, then validate if the account enables the sideloading permission.
+                    "portOccupancy" // Validate available ports to ensure those debug ones are not occupied.
+                ],
+                "portOccupancy": [
+                    53000, // tab service port
+                    7071, // backend service port
+                    9229 // backend inspector port for Node.js debugger
+                ]
             }
         },
         {
             "label": "prepare local environment",
-            "type": "shell",
-            "command": "exit ${command:fx-extension.pre-debug-check}",
-            "presentation": {
-                "reveal": "never"
+            "dependsOn": [
+                "Provision",
+                "Deploy"
+            ],
+            "dependsOrder": "sequence"
+        },
+        {
+            // Create the debug resources.
+            // See https://aka.ms/teamsfx-tasks/provision to know the details and how to customize the args.
+            "label": "Provision",
+            "type": "teamsfx",
+            "command": "provision",
+            "args": {
+                "env": "local"
+            }
+        },
+        {
+            // Build project.
+            // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args.
+            "label": "Deploy",
+            "type": "teamsfx",
+            "command": "deploy",
+            "args": {
+                "env": "local"
             }
         },
         {
@@ -52,7 +86,7 @@
             "options": {
                 "cwd": "${workspaceFolder}/api",
                 "env": {
-                    "PATH": "${command:fx-extension.get-func-path}${env:PATH}"
+                    "PATH": "${workspaceFolder}/devTools/func${command:fx-extension.get-path-delimiter}${env:PATH}"
                 }
             },
             "presentation": {