Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Sep 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
17 changes: 9 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 3 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down Expand Up @@ -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%"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/debugging/node/NodeDebugHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export interface NodeDebugOptions {
sourceMaps?: boolean;
stopOnEntry?: boolean;
timeout?: number;
trace?: boolean | 'verbose';
trace?: boolean;
}

export interface NodeDockerDebugOptions extends NodeDebugOptions {
Expand Down Expand Up @@ -89,7 +89,7 @@ export class NodeDebugHelper implements DebugHelper {
...options,
dockerOptions,
request: 'attach',
type: 'node2'
type: 'pwa-node'
};

if (resolvedConfiguration.localRoot === undefined) {
Expand Down