Update launch tasks and npm scripts (#177)

Author: Anemy

.vscode/launch.json

@@ -6,35 +6,30 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Run Extension",
+      "name": "Launch Extension and Rebuild on Changes (dev)",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-      "outFiles": ["${workspaceFolder}/out/**/*.js"],
+      "args": [
+        "--extensionDevelopmentPath=${workspaceFolder}"
+      ],
+      "outFiles": [
+        "${workspaceFolder}/out/**/*.js"
+      ],
       "preLaunchTask": "${defaultBuildTask}"
     },
     {
-      "name": "Launch Extension (webpack)",
-      "type": "extensionHost",
-      "request": "launch",
-      "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "preLaunchTask": "npm: webpack-dev"
-    },
-    {
-      "name": "Extension Tests",
+      "name": "Launch Extension (prod webpack)",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/out/test/suite/index",
-        "${workspaceRoot}/src/test/fixture"
+        "--extensionDevelopmentPath=${workspaceFolder}"
       ],
-      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-      "preLaunchTask": "${defaultBuildTask}"
+      "outFiles": [
+        "${workspaceFolder}/dist/**/*.js"
+      ],
+      "preLaunchTask": "npm: webpack-dev"
     },
     {
       "type": "node",
@@ -43,14 +38,18 @@
       "protocol": "inspector",
       "port": 6009,
       "sourceMaps": true,
-      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "preLaunchTask": "${defaultBuildTask}"
+      "outFiles": [
+        "${workspaceFolder}/dist/**/*.js"
+      ]
     }
   ],
   "compounds": [
     {
       "name": "Extension + Server Inspector",
-      "configurations": ["Run Extension", "Attach to Language Server"]
+      "configurations": [
+        "Launch Extension and Rebuild on Changes (dev)",
+        "Attach to Language Server"
+      ]
     }
   ]
 }

.vscode/tasks.json

@@ -8,12 +8,9 @@
       "script": "watch",
       "problemMatcher": "$tsc-watch",
       "isBackground": true,
-      "presentation": {
-        "reveal": "never"
-      },
       "group": {
         "kind": "build",
-        "isDefault": true
+        "isDefault": true // This is the `defaultBuildTask`.
       }
     }
   ]

package-lock.json

@@ -38,26 +38,25 @@
     "lint": "eslint ./src/**/*.ts",
     "update-grammar": "ts-node ./scripts/update-grammar.ts",
     "update-snippets": "ts-node ./scripts/update-snippets.ts",
-    "webpack-prod": "webpack --mode production",
-    "webpack-dev": "webpack --mode development",
     "precompile": "npm run clean",
     "compile": "npm-run-all compile:*",
     "compile:keyfile": "ts-node ./scripts/generate-keyfile.ts",
     "compile:resources": "npm run update-grammar && npm run update-snippets",
     "compile:extension": "tsc -p ./",
-    "watch": "npm run clean && npm run webpack-dev && npm-run-all -p watch:*",
+    "compile:extension-bundles": "webpack --mode development",
+    "watch": "npm run compile && npm-run-all -p watch:*",
     "watch:extension": "npm run compile:extension -- -watch",
     "watch:extension-bundles": "webpack --mode development --info-verbosity verbose --watch",
-    "pretest": "npm run clean && npm run compile && npm run webpack-dev && cross-env MONGODB_VERSION=4.2.3 mongodb-runner start --port=27018",
+    "pretest": "npm run compile && cross-env MONGODB_VERSION=4.2.3 mongodb-runner start --port=27018",
     "test": "cross-env NODE_OPTIONS=--no-force-async-hooks-checks xvfb-maybe node ./out/test/runTest.js",
     "posttest": "mongodb-runner stop --port=27018",
-    "vscode:prepublish": "npm run clean && npm run compile && webpack --mode production",
+    "vscode:prepublish": "npm run clean && npm run compile:keyfile && npm run compile:resources && webpack --mode production",
     "check": "mongodb-js-precommit './src/**/*{.ts}'",
     "package": "npm list --production --parseable --depth=99999 --loglevel=info || true && vsce package",
     "local-install": "npm run package && code --install-extension ./mongodb-vscode-*.vsix"
   },
   "engines": {
-    "vscode": "^1.41.0",
+    "vscode": "^1.49.0",
     "node": "^12.4.0",
     "npm": ">=6.13.0"
   },
@@ -842,11 +841,11 @@
     "@types/glob": "^7.1.1",
     "@types/keytar": "4.4.2",
     "@types/mocha": "^7.0.1",
-    "@types/node": "^13.7.1",
+    "@types/node": "^14.11.2",
     "@types/react": "^16.9.25",
     "@types/react-dom": "^16.9.5",
     "@types/sinon": "^9.0.1",
-    "@types/vscode": "^1.41.0",
+    "@types/vscode": "^1.49.0",
     "@types/ws": "^7.2.4",
     "@typescript-eslint/eslint-plugin": "^2.19.2",
     "@typescript-eslint/parser": "^2.19.2",
@@ -880,8 +879,8 @@
     "style-loader": "^1.1.3",
     "ts-loader": "^6.2.2",
     "ts-node": "^8.6.2",
-    "typescript": "^3.7.5",
-    "vsce": "^1.74.0",
+    "typescript": "^3.9.7",
+    "vsce": "^1.81.1",
     "vscode-test": "^1.3.0",
     "webpack": "^4.42.0",
     "webpack-cli": "^3.3.11",