Update vscode-debugadapter to @vscode/debugadapter (#920)

package-lock.json

@@ -10,6 +10,7 @@
 			"license": "%cordova.license%",
 			"dependencies": {
 				"@mixer/parallel-prettier": "^2.0.2",
+				"@vscode/debugadapter": "^1.63.0",
 				"elementtree": "^0.1.6",
 				"execa": "^4.0.0",
 				"gulp-mocha": "^8.0.0",
@@ -19,7 +20,6 @@
 				"socket.io-client": "2.4.0",
 				"uuid": "^9.0.0",
 				"vscode-cdp-proxy": "^0.2.0",
-				"vscode-debugadapter": "^1.51.0",
 				"vscode-debugprotocol": "^1.51.0",
 				"vscode-extension-telemetry": "0.4.5",
 				"vscode-js-debug-browsers": "^1.0.4",
@@ -1864,6 +1864,22 @@
 			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
 			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="
 		},
+		"node_modules/@vscode/debugadapter": {
+			"version": "1.63.0",
+			"resolved": "https://registry.npmjs.org/@vscode/debugadapter/-/debugadapter-1.63.0.tgz",
+			"integrity": "sha512-d2eAnYCZkKJ0C28gT93KPi5YXFav8VyagcxkJ94LZ8qqgJ27+2ct26MOHGYKB8L25ZdDs8A4YmyJO32J0afhNQ==",
+			"dependencies": {
+				"@vscode/debugprotocol": "1.63.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@vscode/debugprotocol": {
+			"version": "1.63.0",
+			"resolved": "https://registry.npmjs.org/@vscode/debugprotocol/-/debugprotocol-1.63.0.tgz",
+			"integrity": "sha512-7gewwv69pA7gcJUhtJsru5YN7E1AwwnlBrF5mJY4R/NGInOUqOYOWHlqQwG+4AXn0nXWbcn26MHgaGI9Q26SqA=="
+		},
 		"node_modules/@vscode/test-electron": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.2.tgz",
@@ -15578,27 +15594,6 @@
 				"ws": "^7.2.1"
 			}
 		},
-		"node_modules/vscode-debugadapter": {
-			"version": "1.51.0",
-			"resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.51.0.tgz",
-			"integrity": "sha512-mObaXD5/FH/z6aL2GDuyCLbnwLsYRCAJWgFid01vKW9Y5Si8OvINK+Tn+Yl/lRUbetjNuZW3j1euMEz6z8Yzqg==",
-			"deprecated": "This package has been renamed to @vscode/debugadapter, please update to the new name",
-			"dependencies": {
-				"mkdirp": "^1.0.4",
-				"vscode-debugprotocol": "1.51.0"
-			}
-		},
-		"node_modules/vscode-debugadapter/node_modules/mkdirp": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-			"bin": {
-				"mkdirp": "bin/cmd.js"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/vscode-debugprotocol": {
 			"version": "1.51.0",
 			"resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.51.0.tgz",
@@ -17703,6 +17698,19 @@
 			"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
 			"integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="
 		},
+		"@vscode/debugadapter": {
+			"version": "1.63.0",
+			"resolved": "https://registry.npmjs.org/@vscode/debugadapter/-/debugadapter-1.63.0.tgz",
+			"integrity": "sha512-d2eAnYCZkKJ0C28gT93KPi5YXFav8VyagcxkJ94LZ8qqgJ27+2ct26MOHGYKB8L25ZdDs8A4YmyJO32J0afhNQ==",
+			"requires": {
+				"@vscode/debugprotocol": "1.63.0"
+			}
+		},
+		"@vscode/debugprotocol": {
+			"version": "1.63.0",
+			"resolved": "https://registry.npmjs.org/@vscode/debugprotocol/-/debugprotocol-1.63.0.tgz",
+			"integrity": "sha512-7gewwv69pA7gcJUhtJsru5YN7E1AwwnlBrF5mJY4R/NGInOUqOYOWHlqQwG+4AXn0nXWbcn26MHgaGI9Q26SqA=="
+		},
 		"@vscode/test-electron": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.2.tgz",
@@ -28499,22 +28507,6 @@
 				"ws": "^7.2.1"
 			}
 		},
-		"vscode-debugadapter": {
-			"version": "1.51.0",
-			"resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.51.0.tgz",
-			"integrity": "sha512-mObaXD5/FH/z6aL2GDuyCLbnwLsYRCAJWgFid01vKW9Y5Si8OvINK+Tn+Yl/lRUbetjNuZW3j1euMEz6z8Yzqg==",
-			"requires": {
-				"mkdirp": "^1.0.4",
-				"vscode-debugprotocol": "1.51.0"
-			},
-			"dependencies": {
-				"mkdirp": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-				}
-			}
-		},
 		"vscode-debugprotocol": {
 			"version": "1.51.0",
 			"resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.51.0.tgz",

package.json

@@ -665,6 +665,7 @@
 	},
 	"dependencies": {
 		"@mixer/parallel-prettier": "^2.0.2",
+		"@vscode/debugadapter": "^1.63.0",
 		"elementtree": "^0.1.6",
 		"execa": "^4.0.0",
 		"gulp-mocha": "^8.0.0",
@@ -674,7 +675,6 @@
 		"socket.io-client": "2.4.0",
 		"uuid": "^9.0.0",
 		"vscode-cdp-proxy": "^0.2.0",
-		"vscode-debugadapter": "^1.51.0",
 		"vscode-debugprotocol": "^1.51.0",
 		"vscode-extension-telemetry": "0.4.5",
 		"vscode-js-debug-browsers": "^1.0.4",
@@ -736,4 +736,4 @@
 	"extensionDependencies": [
 		"ms-vscode.js-debug"
 	]
-}
+}

src/debugger/cordovaDebugSession.ts

@@ -11,7 +11,7 @@ import {
     Logger,
     LoggingDebugSession,
     OutputEvent,
-} from "vscode-debugadapter";
+} from "@vscode/debugadapter";
 import { DebugProtocol } from "vscode-debugprotocol";
 import simulate = require("cordova-simulate");
 import {

src/debugger/jsDebugConfigAdapter.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
-import { logger } from "vscode-debugadapter";
+import { logger } from "@vscode/debugadapter";
 import * as nls from "vscode-nls";
 import { CordovaProjectHelper } from "../utils/cordovaProjectHelper";
 import { ICordovaAttachRequestArgs } from "./requestArgs";