diff --git a/build/azure-pipelines/linux/build.yml b/build/azure-pipelines/linux/build.yml index 0861d80..b6dc190 100644 --- a/build/azure-pipelines/linux/build.yml +++ b/build/azure-pipelines/linux/build.yml @@ -1,8 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: '20.14.0' - displayName: 'Use Node.js 20.14.0' + versionSpec: '22.22.0' + displayName: 'Use Node.js 22.22.0' - script: | npm ci diff --git a/build/azure-pipelines/lsif-repository-tests.yml b/build/azure-pipelines/lsif-repository-tests.yml index 4418b1d..729e26f 100644 --- a/build/azure-pipelines/lsif-repository-tests.yml +++ b/build/azure-pipelines/lsif-repository-tests.yml @@ -15,8 +15,8 @@ pool: steps: - task: NodeTool@0 inputs: - versionSpec: '14.16.0' - displayName: 'Use Node.js 14.16.0' + versionSpec: '22.22.0' + displayName: 'Use Node.js 22.22.0' - script: | npm ci diff --git a/build/azure-pipelines/pipeline.yml b/build/azure-pipelines/pipeline.yml index 767fe05..4c89f77 100644 --- a/build/azure-pipelines/pipeline.yml +++ b/build/azure-pipelines/pipeline.yml @@ -45,13 +45,13 @@ extends: testPlatforms: - name: Linux nodeVersions: - - 20.9.0 + - 22.22.0 - name: MacOS nodeVersions: - - 20.9.0 + - 22.22.0 - name: Windows nodeVersions: - - 20.9.0 + - 22.22.0 testSteps: - template: /build/azure-pipelines/templates/test-steps.yml@self parameters: @@ -74,13 +74,13 @@ extends: testPlatforms: - name: Linux nodeVersions: - - 20.9.0 + - 22.22.0 - name: MacOS nodeVersions: - - 20.9.0 + - 22.22.0 - name: Windows nodeVersions: - - 20.9.0 + - 22.22.0 testSteps: - template: /build/azure-pipelines/templates/test-steps.yml@self parameters: diff --git a/build/azure-pipelines/win32/build.yml b/build/azure-pipelines/win32/build.yml index c16b78c..22549a1 100644 --- a/build/azure-pipelines/win32/build.yml +++ b/build/azure-pipelines/win32/build.yml @@ -1,8 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: '20.14.0' - displayName: 'Use Node.js 20.14.0' + versionSpec: '22.22.0' + displayName: 'Use Node.js 22.22.0' - script: | npm ci diff --git a/language-service/package-lock.json b/language-service/package-lock.json index 215a0ce..3a9935d 100644 --- a/language-service/package-lock.json +++ b/language-service/package-lock.json @@ -18,7 +18,7 @@ "@types/semver": "^7.5.7" }, "engines": { - "node": ">=20.9.0" + "node": ">=22" } }, "@vscode/0.6.0-next.8": { diff --git a/language-service/package.json b/language-service/package.json index 86fef23..6653e3a 100644 --- a/language-service/package.json +++ b/language-service/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/Microsoft/lsif-node/issues" }, "engines": { - "node": ">=20.9.0" + "node": ">=22" }, "main": "./lib/api.js", "typings": "./lib/api.d.ts", diff --git a/package-lock.json b/package-lock.json index aa5361e..d3b66fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "MIT", "devDependencies": { - "@types/node": "20.9.0", + "@types/node": "22.19.15", "@types/shelljs": "^0.8.15", "@types/uuid": "^10.0.0", "@types/yargs": "^17.0.32", @@ -177,13 +177,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", - "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==", + "version": "22.19.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz", + "integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "node_modules/@types/shelljs": { @@ -2197,9 +2197,9 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true, "license": "MIT" }, @@ -2446,12 +2446,12 @@ "dev": true }, "@types/node": { - "version": "20.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", - "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==", + "version": "22.19.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz", + "integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==", "dev": true, "requires": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "@types/shelljs": { @@ -3817,9 +3817,9 @@ "dev": true }, "undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index 8e0670c..4bd34be 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "homepage": "https://microsoft.github.io/language-server-protocol/overviews/lsif/overview/", "devDependencies": { - "@types/node": "20.9.0", + "@types/node": "22.19.15", "@types/shelljs": "^0.8.15", "@types/uuid": "^10.0.0", "@types/yargs": "^17.0.32", diff --git a/protocol/package-lock.json b/protocol/package-lock.json index 0dca394..422cd48 100644 --- a/protocol/package-lock.json +++ b/protocol/package-lock.json @@ -12,7 +12,7 @@ "vscode-languageserver-types": "^3.17.5" }, "engines": { - "node": ">=20.9.0" + "node": ">=22" } }, "node_modules/vscode-languageserver-types": { diff --git a/protocol/package.json b/protocol/package.json index 056308c..cef2a4d 100644 --- a/protocol/package.json +++ b/protocol/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/Microsoft/lsif-node/issues" }, "engines": { - "node": ">=20.9.0" + "node": ">=22" }, "main": "./lib/main.js", "exports": { diff --git a/sqlite/package-lock.json b/sqlite/package-lock.json index 835809b..ec74c75 100644 --- a/sqlite/package-lock.json +++ b/sqlite/package-lock.json @@ -12,6 +12,7 @@ "better-sqlite3": "^10.1.0", "lsif-protocol": "0.6.0-next.7", "uuid": "^10.0.0", + "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8", "yargs": "^17.7.2" }, @@ -20,14 +21,14 @@ }, "devDependencies": { "@types/better-sqlite3": "^7.6.10", - "@types/node": "20.9.0", + "@types/node": "22.19.15", "@types/uuid": "^10.0.0" } }, "node_modules/@types/better-sqlite3": { - "version": "7.6.10", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.10.tgz", - "integrity": "sha512-TZBjD+yOsyrUJGmcUj6OS3JADk3+UZcNv3NOBqGkM09bZdi28fNZw8ODqbMOLfKCu7RYCO62/ldq1iHbzxqoPw==", + "version": "7.6.13", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz", + "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==", "dev": true, "license": "MIT", "dependencies": { @@ -35,13 +36,13 @@ } }, "node_modules/@types/node": { - "version": "20.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", - "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==", + "version": "22.19.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz", + "integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "node_modules/@types/uuid": { @@ -97,6 +98,7 @@ "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-10.1.0.tgz", "integrity": "sha512-hqpHJaCfKEZFaAWdMh6crdzRWyzQzfP6Ih8TYI0vFn01a6ZTDSbJIMXN+6AMBaBOh99DzUy8l3PsV9R3qnJDng==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "bindings": "^1.5.0", "prebuild-install": "^7.1.1" @@ -586,10 +588,11 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" }, "node_modules/util-deprecate": { "version": "1.0.2", @@ -626,10 +629,17 @@ "vscode-languageserver-types": "3.16.0" } }, - "node_modules/vscode-languageserver-types": { + "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": { "version": "3.16.0", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==", + "license": "MIT" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" }, "node_modules/vscode-uri": { "version": "3.0.8", @@ -698,21 +708,21 @@ }, "dependencies": { "@types/better-sqlite3": { - "version": "7.6.10", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.10.tgz", - "integrity": "sha512-TZBjD+yOsyrUJGmcUj6OS3JADk3+UZcNv3NOBqGkM09bZdi28fNZw8ODqbMOLfKCu7RYCO62/ldq1iHbzxqoPw==", + "version": "7.6.13", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz", + "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==", "dev": true, "requires": { "@types/node": "*" } }, "@types/node": { - "version": "20.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz", - "integrity": "sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==", + "version": "22.19.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.15.tgz", + "integrity": "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==", "dev": true, "requires": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "@types/uuid": { @@ -1081,9 +1091,9 @@ } }, "undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true }, "util-deprecate": { @@ -1108,12 +1118,19 @@ "requires": { "vscode-jsonrpc": "6.0.0", "vscode-languageserver-types": "3.16.0" + }, + "dependencies": { + "vscode-languageserver-types": { + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", + "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + } } }, "vscode-languageserver-types": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz", - "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==" + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" }, "vscode-uri": { "version": "3.0.8", diff --git a/sqlite/package.json b/sqlite/package.json index 4fc8f74..b21c613 100644 --- a/sqlite/package.json +++ b/sqlite/package.json @@ -20,13 +20,14 @@ "better-sqlite3": "^10.1.0", "lsif-protocol": "0.6.0-next.7", "uuid": "^10.0.0", + "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8", "yargs": "^17.7.2" }, "devDependencies": { "@types/better-sqlite3": "^7.6.10", "@types/uuid": "^10.0.0", - "@types/node": "20.9.0" + "@types/node": "22.19.15" }, "scripts": { "compile": "tsc -b ./tsconfig.json", diff --git a/sqlite/src/blobStore.ts b/sqlite/src/blobStore.ts index c64ae84..aee2096 100644 --- a/sqlite/src/blobStore.ts +++ b/sqlite/src/blobStore.ts @@ -9,7 +9,7 @@ import Sqlite from 'better-sqlite3'; import * as uuid from 'uuid'; -import * as lsp from 'vscode-languageserver-protocol'; +import * as lsp from 'vscode-languageserver-types'; import { Edge, Vertex, ElementTypes, VertexLabels, Document, Range, EdgeLabels, contains, Event, EventScope, EventKind, Id, DocumentEvent, FoldingRangeResult, diff --git a/sqlite/src/compress.ts b/sqlite/src/compress.ts index dec8471..a051aee 100644 --- a/sqlite/src/compress.ts +++ b/sqlite/src/compress.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ 'use strict'; -import * as lsp from 'vscode-languageserver-protocol'; +import * as lsp from 'vscode-languageserver-types'; import { Element, ElementTypes, VertexLabels, V, DeclarationTag, UnknownTag, ResultSet, RangeTagTypes, DefinitionTag, ReferenceTag, RangeTag, Range,