From fc27999ba9029f31e2cbe75717f3b11b8ebd814d Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Wed, 2 Oct 2024 13:54:30 +0200 Subject: [PATCH 1/2] Bump minimum VS Code version to 1.90.0 --- extensions/ql-vscode/CHANGELOG.md | 2 ++ .../ql-vscode/gulpfile.ts/chromium-version.json | 4 ++-- extensions/ql-vscode/package-lock.json | 13 +++++++------ extensions/ql-vscode/package.json | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 0547c69db7a..2df1d3a5595 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,8 @@ ## [UNRELEASED] +- Increase the required version of VS Code to 1.90.0. [#3737](https://github.com/github/vscode-codeql/pull/3737) + ## 1.15.0 - 26 September 2024 - Update results view to display the length of the shortest path for path queries. [#3687](https://github.com/github/vscode-codeql/pull/3687) diff --git a/extensions/ql-vscode/gulpfile.ts/chromium-version.json b/extensions/ql-vscode/gulpfile.ts/chromium-version.json index e3f8f015fed..e2433ceb1f9 100644 --- a/extensions/ql-vscode/gulpfile.ts/chromium-version.json +++ b/extensions/ql-vscode/gulpfile.ts/chromium-version.json @@ -1,4 +1,4 @@ { - "chromiumVersion": "114", - "electronVersion": "25.8.0" + "chromiumVersion": "122", + "electronVersion": "29.4.0" } diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 8a7ace713c2..cbc8c56b11e 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -92,7 +92,7 @@ "@types/tar-stream": "^3.1.3", "@types/through2": "^2.0.36", "@types/tmp": "^0.2.6", - "@types/vscode": "^1.82.0", + "@types/vscode": "^1.90.0", "@types/yauzl": "^2.10.3", "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", @@ -144,7 +144,7 @@ "engines": { "node": "^20.15.1", "npm": ">=7.20.6", - "vscode": "^1.82.0" + "vscode": "^1.90.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -6485,10 +6485,11 @@ } }, "node_modules/@types/vscode": { - "version": "1.85.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.85.0.tgz", - "integrity": "sha512-CF/RBon/GXwdfmnjZj0WTUMZN5H6YITOfBCP4iEZlOtVQXuzw6t7Le7+cR+7JzdMrnlm7Mfp49Oj2TuSXIWo3g==", - "dev": true + "version": "1.93.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.93.0.tgz", + "integrity": "sha512-kUK6jAHSR5zY8ps42xuW89NLcBpw1kOabah7yv38J8MyiYuOHxLQBi0e7zeXbQgVefDy/mZZetqEFC+Fl5eIEQ==", + "dev": true, + "license": "MIT" }, "node_modules/@types/wrap-ansi": { "version": "3.0.0", diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index bb3e2b9c0b6..c91eac56f02 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -13,7 +13,7 @@ "url": "https://github.com/github/vscode-codeql" }, "engines": { - "vscode": "^1.82.0", + "vscode": "^1.90.0", "node": "^20.15.1", "npm": ">=7.20.6" }, @@ -2050,7 +2050,7 @@ "@types/tar-stream": "^3.1.3", "@types/through2": "^2.0.36", "@types/tmp": "^0.2.6", - "@types/vscode": "^1.82.0", + "@types/vscode": "^1.90.0", "@types/yauzl": "^2.10.3", "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", From b25def9584e18f6a1997f830b09564d57346a962 Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Tue, 8 Oct 2024 14:25:27 +0200 Subject: [PATCH 2/2] Install exact version of @types/vscode --- extensions/ql-vscode/package-lock.json | 8 ++++---- extensions/ql-vscode/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 2926fbbc5a0..bbe00667f48 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -92,7 +92,7 @@ "@types/tar-stream": "^3.1.3", "@types/through2": "^2.0.36", "@types/tmp": "^0.2.6", - "@types/vscode": "^1.90.0", + "@types/vscode": "1.90.0", "@types/yauzl": "^2.10.3", "@typescript-eslint/eslint-plugin": "^8.8.0", "@typescript-eslint/parser": "^8.8.0", @@ -6480,9 +6480,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.93.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.93.0.tgz", - "integrity": "sha512-kUK6jAHSR5zY8ps42xuW89NLcBpw1kOabah7yv38J8MyiYuOHxLQBi0e7zeXbQgVefDy/mZZetqEFC+Fl5eIEQ==", + "version": "1.90.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.90.0.tgz", + "integrity": "sha512-oT+ZJL7qHS9Z8bs0+WKf/kQ27qWYR3trsXpq46YDjFqBsMLG4ygGGjPaJ2tyrH0wJzjOEmDyg9PDJBBhWg9pkQ==", "dev": true, "license": "MIT" }, diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index fe2e812706c..d1d1f10fdf2 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2050,7 +2050,7 @@ "@types/tar-stream": "^3.1.3", "@types/through2": "^2.0.36", "@types/tmp": "^0.2.6", - "@types/vscode": "^1.90.0", + "@types/vscode": "1.90.0", "@types/yauzl": "^2.10.3", "@typescript-eslint/eslint-plugin": "^8.8.0", "@typescript-eslint/parser": "^8.8.0",