Change to pwa-node for Node debug (cherry-pick #3179) (#3180)

microsoft · Sep 1, 2021 · aa56b28 · aa56b28
1 parent 42ff646
commit aa56b28
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.16.1 - 1 September 2021
+### Fixed
+* Node debugging does not work in VS Code 1.60.0 due to removal of `node2` debug type. [#3177](https://github.com/microsoft/vscode-docker/issues/3177)
+
 ## 1.16.0 - 16 August 2021
 ### Added
 * VSCode's [Workspace Trust](https://code.visualstudio.com/updates/v1_57#_workspace-trust) feature is now supported. [#2829](https://github.com/microsoft/vscode-docker/issues/2829)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vscode-docker",
-    "version": "1.16.0",
+    "version": "1.16.1",
     "publisher": "ms-azuretools",
     "displayName": "Docker",
     "description": "Makes it easy to create, manage, and debug containerized applications.",
@@ -826,15 +826,8 @@
                                         }
                                     },
                                     "trace": {
-                                        "type": [
-                                            "boolean",
-                                            "string"
-                                        ],
-                                        "description": "%vscode-docker.debug.node.trace%",
-                                        "enum": [
-                                            "verbose",
-                                            true
-                                        ]
+                                        "type": "boolean",
+                                        "description": "%vscode-docker.debug.node.trace%"
                                     }
                                 }
                             },

diff --git a/src/debugging/node/NodeDebugHelper.ts b/src/debugging/node/NodeDebugHelper.ts
@@ -24,7 +24,7 @@ export interface NodeDebugOptions {
     sourceMaps?: boolean;
     stopOnEntry?: boolean;
     timeout?: number;
-    trace?: boolean | 'verbose';
+    trace?: boolean;
 }
 
 export interface NodeDockerDebugOptions extends NodeDebugOptions {
@@ -89,7 +89,7 @@ export class NodeDebugHelper implements DebugHelper {
             ...options,
             dockerOptions,
             request: 'attach',
-            type: 'node2'
+            type: 'pwa-node'
         };
 
         if (resolvedConfiguration.localRoot === undefined) {