Merge #28

28: Update JS dependencies, improve binary paths in default config r=noppej a=Tiwalun Co-authored-by: Dominik Boehi <[email protected]>
probe-rs · Jan 31, 2022 · f646608 · f646608
2 parents 31b1843 + 54ccfb0
commit f646608
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,12 +7,11 @@
 			"request": "launch",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"${workspaceFolder}/debug_example"
 			],
 			"outFiles": [
 				"${workspaceFolder}/dist/ext/**/*.js"
 			],
 			"preLaunchTask": "npm: watch"
 		}
 	]
-}
+}
diff --git a/package.json b/package.json
@@ -43,29 +43,29 @@
     "watch-web": "webpack --watch --devtool nosources-source-map  --config ./build/web-extension.webpack.config.js",
     "package-web": "webpack --mode production --config ./build/web-extension.webpack.config.js"
   },
-  "enableProposedApi": false,
+  "enableApiProposal": false,
   "dependencies": {
+    "@vscode/debugadapter": "^1.51.0",
     "await-notify": "1.0.1",
-    "portfinder": "^1.0.28",
-    "vscode-debugadapter": "^1.49.0"
+    "portfinder": "^1.0.28"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.11.3",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.13",
     "@types/vscode": "^1.61.0",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
-    "eslint": "^8.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
+    "@vscode/debugadapter-testsupport": "^1.51.0",
+    "eslint": "^8.8.0",
     "glob": "^7.2.0",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.0",
     "portfinder": "^1.0.28",
     "ts-loader": "^9.2.6",
-    "typescript": "^4.4.4",
-    "vsce": "^2.3.0",
-    "vscode-debugadapter-testsupport": "^1.49.0",
-    "webpack": "^5.64.1",
-    "webpack-cli": "^4.9.1"
+    "typescript": "^4.5.5",
+    "vsce": "^2.6.5",
+    "webpack": "^5.67.0",
+    "webpack-cli": "^4.9.2"
   },
   "main": "./dist/ext/extension.js",
   "browser": "./dist/web/extension.js",
@@ -103,12 +103,12 @@
               "programBinary": {
                 "type": "string",
                 "description": "The path (relative to `cwd` or absolute) to the binary for your target firmware",
-                "default": "./target/debug/thumbv7em-none-eabihf/${workspaceFolderBasename}"
+                "default": "./target/thumbv7em-none-eabihf/debug/${workspaceFolderBasename}"
               },
               "cwd": {
                 "type": "string",
                 "description": "The working directory of the debugger, typically the RUST crate root",
-                "default": "${workspaceFolder}}"
+                "default": "${workspaceFolder}"
               },
               "chip": {
                 "type": "string",
@@ -345,7 +345,8 @@
             "type": "probe-rs-debug",
             "request": "launch",
             "name": "probe-rs Test",
-            "programBinary": "./target/debug/thumbv7em-none-eabihf/${workspaceFolderBasename}",
+            "programBinary": "./target/thumbv7em-none-eabihf/debug/${workspaceFolderBasename}",
+            "cwd": "${workspaceFolder}",
             "chip": "STM32H745ZITx",
             "connectUnderReset": true,
             "flashingEnabled": true,
@@ -361,7 +362,8 @@
               "type": "probe-rs-debug",
               "request": "launch",
               "name": "probe-rs Test",
-              "programBinary": "./target/debug/thumbv7em-none-eabihf/${workspaceFolderBasename}",
+              "programBinary": "./target/thumbv7em-none-eabihf/$debug/{workspaceFolderBasename}",
+              "cwd": "${workspaceFolder}",
               "chip": "STM32H745ZITx",
               "connectUnderReset": true
             }