From d9559783fb7320d575e21280e6381b6124fd0327 Mon Sep 17 00:00:00 2001 From: Anemy Date: Mon, 5 Oct 2020 20:40:44 +0200 Subject: [PATCH 1/3] Update deps and cleanup launch tasks --- .vscode/launch.json | 40 ++++++++++++++++++++-------------------- .vscode/tasks.json | 5 +---- package-lock.json | 20 +++++++++++++------- package.json | 8 ++++---- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 12c8af785..d26f74bbe 100644 --- a/.vscode/launch.json +++ b/.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,19 @@ "protocol": "inspector", "port": 6009, "sourceMaps": true, - "outFiles": ["${workspaceFolder}/dist/**/*.js"], + "outFiles": [ + "${workspaceFolder}/dist/**/*.js" + ], "preLaunchTask": "${defaultBuildTask}" } ], "compounds": [ { "name": "Extension + Server Inspector", - "configurations": ["Run Extension", "Attach to Language Server"] + "configurations": [ + "Run Extension", + "Attach to Language Server" + ] } ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 078ff7e01..052a3fe13 100644 --- a/.vscode/tasks.json +++ b/.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`. } } ] diff --git a/package-lock.json b/package-lock.json index 1fb4e60b0..220a1998b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -789,9 +789,9 @@ "dev": true }, "@types/node": { - "version": "13.13.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.21.tgz", - "integrity": "sha512-tlFWakSzBITITJSxHV4hg4KvrhR/7h3xbJdSFbYJBVzKubrASbnnIFuSgolUh7qKGo/ZeJPKUfbZ0WS6Jp14DQ==", + "version": "14.11.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", + "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==", "dev": true }, "@types/normalize-package-data": { @@ -13916,15 +13916,15 @@ "dev": true }, "vsce": { - "version": "1.80.0", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.80.0.tgz", - "integrity": "sha512-pnJT0LttCd5k1fJRsTOer8NvgesMYxLZYTUwuVWVOgONK9w+U5Yf32rtm4cX374TsHZbBwUr6ZFLP36wyDD8/g==", + "version": "1.81.1", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.81.1.tgz", + "integrity": "sha512-1yWAYRxTx/PKSFZnuELe7GPyIo70H/XKJqf6wGikofUK3f3TCNGI6F9xkTQFvXKNe0AygUuxN7kITyPIQGMP+w==", "dev": true, "requires": { "azure-devops-node-api": "^7.2.0", "chalk": "^2.4.2", "cheerio": "^1.0.0-rc.1", - "commander": "^2.8.1", + "commander": "^6.1.0", "denodeify": "^1.2.1", "glob": "^7.0.6", "leven": "^3.1.0", @@ -13957,6 +13957,12 @@ "parse5": "^3.0.1" } }, + "commander": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz", + "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==", + "dev": true + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", diff --git a/package.json b/package.json index 9f19c50e4..7c9ee1652 100644 --- a/package.json +++ b/package.json @@ -842,11 +842,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 +880,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", From e64f9f0047a8cf11a42203d09d36da7f3249ac9a Mon Sep 17 00:00:00 2001 From: Anemy Date: Mon, 5 Oct 2020 21:07:01 +0200 Subject: [PATCH 2/3] Update commands and launch tasks --- .vscode/launch.json | 5 ++--- package.json | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index d26f74bbe..45e32f79b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -40,15 +40,14 @@ "sourceMaps": true, "outFiles": [ "${workspaceFolder}/dist/**/*.js" - ], - "preLaunchTask": "${defaultBuildTask}" + ] } ], "compounds": [ { "name": "Extension + Server Inspector", "configurations": [ - "Run Extension", + "Launch Extension and Rebuild on Changes (dev)", "Attach to Language Server" ] } diff --git a/package.json b/package.json index 7c9ee1652..d70096ed5 100644 --- a/package.json +++ b/package.json @@ -38,20 +38,19 @@ "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" From d51fe3b56ec2257bb2c63a39437def85a501b9ee Mon Sep 17 00:00:00 2001 From: Anemy Date: Mon, 5 Oct 2020 21:29:22 +0200 Subject: [PATCH 3/3] Update vscode engine version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d70096ed5..2879e2468 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "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" },