Skip to content

Commit

Permalink
Update minimum VS Code engine to 1.52.0
Browse files Browse the repository at this point in the history
This updates the vscode-languageclient library to the 7.0.0 release, which requires the minimum vs code engine to be 1.52.0.

The vscode-languageclient 7.0.0 release is the current supported release, but we pinned to 7.0.0-next.12. We shouldn't be running on the interim releases, but we were waiting on hashicorp/terraform-ls#608 to merge to support the changed jsonrpc constructs in 7.0.0. Now that that is merged, released, and in the wild for a significant amount of time we can move to the 7.0.0 vscode-languageclient version.

This requires us to increment the minimum supported version of VS Code to 1.52.0. This means any user with a VS Code version lower than 1.52.0 will not see an updated extension in the marketplace, but will still receive updated terraform-ls releases through the automatic updater.
  • Loading branch information
jpogran committed Sep 22, 2021
1 parent 7cb7811 commit a4e8cd6
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 33 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
70 changes: 46 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
"license": "MPL-2.0",
"private": true,
"engines": {
"npm": "^7.17.0",
"vscode": "^1.50.1"
"npm": "~6.X",
"node": "~14.X",
"vscode": "^1.52.0"
},
"qna": "https://discuss.hashicorp.com/c/terraform-core/terraform-editor-integrations/46",
"bugs": {
Expand Down Expand Up @@ -232,7 +233,7 @@
"semver": "^7.3.5",
"short-unique-id": "^3.2.3",
"vscode-extension-telemetry": "^0.1.7",
"vscode-languageclient": "^7.0.0-next.12",
"vscode-languageclient": "^7.0.0",
"vscode-uri": "^3.0.2",
"which": "^2.0.2",
"yauzl": "^2.10.0"
Expand All @@ -242,7 +243,7 @@
"@types/mocha": "^8.2.2",
"@types/node": "^12.12.54",
"@types/openpgp": "^4.4.15",
"@types/vscode": "^1.46.0",
"@types/vscode": "^1.52.0",
"@types/yauzl": "^2.9.1",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
Expand Down
14 changes: 9 additions & 5 deletions src/test/runTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,24 @@ async function main(): Promise<void> {
// Download VS Code, unzip it and run the integration test
// start in the fixtures folder to prevent the language server from walking all the
// project root folders, like node_modules
await runTests({ extensionDevelopmentPath, extensionTestsPath, launchArgs: ['testFixture', '--disable-extensions'] }); // use current release
await runTests({
extensionDevelopmentPath,
extensionTestsPath,
launchArgs: ['testFixture', '--disable-extensions'],
}); // use current release

await runTests({
extensionDevelopmentPath,
extensionTestsPath,
version: 'insiders',
launchArgs: ['testFixture', '--disable-extensions']
launchArgs: ['testFixture', '--disable-extensions'],
});

await runTests({
extensionDevelopmentPath,
extensionTestsPath,
version: '1.50.1',
launchArgs: ['testFixture', '--disable-extensions']
version: '1.52.0',
launchArgs: ['testFixture', '--disable-extensions'],
});
} catch (err) {
console.error(err);
Expand All @@ -48,4 +52,4 @@ async function main(): Promise<void> {
}
}

main();
main();

0 comments on commit a4e8cd6

Please sign in to comment.