Switch to the new vscode-js-debug extension per default

Author: mpotthoff

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Unreleased
 * Support primitive `adbPath` expansion ([#3](https://github.com/mpotthoff/vscode-android-webview-debug/pull/3)) by [@buschtoens](https://github.com/buschtoens)
+* Switch to the new [vscode-js-debug](https://github.com/microsoft/vscode-js-debug) extension per default
 
 ## 1.1.2 - 2021-06-18
 * Allow the user to select which page to debug in case multiple are available ([#2](https://github.com/mpotthoff/vscode-android-webview-debug/issues/2))

README.md

@@ -22,9 +22,9 @@ A VS Code extension to debug your JavaScript code in the Google Chrome browser o
 
 ## Requirements
 
-### Debugger for Chrome
+### vscode-js-debug
 
-This extension uses the [Debugger for Chrome](https://github.com/Microsoft/vscode-chrome-debug) extension under the hood.
+This extension uses the [vscode-js-debug](https://github.com/microsoft/vscode-js-debug) extension under the hood.
 
 ## Using the debugger
 
@@ -34,7 +34,9 @@ When your launch config is set up, you can debug your project. Pick a launch con
 
 Right now the extension only supports attaching to an already running Google Chrome or WebView instance. This can be configured in the `.vscode/launch.json` file in the root directory of your project.
 
-> All configuration options of the `attach` configuration of the [Debugger for Chrome](https://github.com/Microsoft/vscode-chrome-debug#attach) extension are supported.
+In case you want to use the old [Debugger for Chrome](https://github.com/Microsoft/vscode-chrome-debug) extension you can set `debug.javascript.usePreview` to `false`.
+
+> All configuration options of the `pwa-chrome: attach` configuration of the [vscode-js-debug](https://github.com/microsoft/vscode-js-debug/blob/main/OPTIONS.md#pwa-chrome-attach) extension are supported.
 
 You can optionally specify a port to use for the debugging connection or let the extension automatically choose an unsued one.
 

package.json

@@ -71,61 +71,6 @@
  "port": {
  "type": "number",
  "default": 9222
- },
- "sourceMaps": {
- "type": "boolean",
- "default": true
- },
- "trace": {
- "type": [
- "boolean",
- "string"
- ],
- "enum": [
- "verbose",
- true
- ],
- "default": true
- },
- "url": {
- "type": "string",
- "default": "http://localhost:8080"
- },
- "webRoot": {
- "type": "string",
- "default": "${workspaceFolder}"
- },
- "pathMapping": {
- "type": "object",
- "default": {}
- },
- "sourceMapPathOverrides": {
- "type": "object",
- "default": {}
- },
- "smartStep": {
- "type": "boolean",
- "default": true
- },
- "skipFiles": {
- "type": "array",
- "default": []
- },
- "timeout": {
- "type": "number",
- "default": 10000
- },
- "disableNetworkCache": {
- "type": "boolean",
- "default": true
- },
- "urlFilter": {
- "type": "string",
- "default": ""
- },
- "showAsyncStacks": {
- "type": "boolean",
- "default": true
  }
  }
  }
@@ -171,6 +116,6 @@
  "typescript": "4.3.5"
  },
  "extensionDependencies": [
- "msjsdiag.debugger-for-chrome"
+ "ms-vscode.js-debug"
  ]
 }

src/debugConfigurationProvider.ts

@@ -83,8 +83,10 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
  delete debugConfiguration.preLaunchTask;
  }
 
+ const useNewDebugger = vscode.workspace.getConfiguration("debug.javascript").get<boolean>("usePreview") ?? true;
+
  // Rewrite type to chrome
- debugConfiguration.type = "chrome";
+ debugConfiguration.type = useNewDebugger ? "pwa-chrome" : "chrome";
 
  // Test the bridge to ensure that the required executables exist
  await bridge.test();
@@ -198,10 +200,9 @@ export class DebugConfigurationProvider implements vscode.DebugConfigurationProv
  // Forward the debugger to the local port
  debugConfiguration.port = await bridge.forwardDebugger(webView, debugConfiguration.port);
 
- // In case neither url and urlFilter are configured we are going to try and
- // retrieve the list of available pages. If more than one is available we will allow
- // the user to choose one to debug.
- if (!debugConfiguration.url && !debugConfiguration.urlFilter) {
+ // In case the old debugger is used and neither url and urlFilter are configured we are going to try and
+ // retrieve the list of available pages. If more than one is available we will allow the user to choose one to debug.
+ if (!useNewDebugger && !debugConfiguration.url && !debugConfiguration.urlFilter) {
  try {
  const pages = await bridge.getWebViewPages(debugConfiguration.port);
  if (pages.length > 1) {