Merge branch 'main' into dependabot/npm_and_yarn/extensions/ql-vscode/github/markdownlint-github-0.8.0

Author: norascheuch

docs/test-plan.md

@@ -45,7 +45,7 @@ choose to go through some of the Optional Test Cases.
 #### Test case 2: Running a problem query and viewing results
 
 1. Open the [javascript ReDoS query](https://github.com/github/codeql/blob/main/javascript/ql/src/Performance/ReDoS.ql).
-2. Select the `babel/babel` database (or download it if you don't have one already)
+2. Select the `angular-cn/ng-nice` database (or download it if you don't have one already)
 3. Run a local query.
 4. Once the query completes:
    - Check that the result messages are rendered

extensions/ql-vscode/.nvmrc

@@ -1 +1 @@
-v20.18.3
+v22.15.1

extensions/ql-vscode/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [UNRELEASED]
 
+- Add new command "CodeQL: Trim Overlay Base Cache" that returns a database to the state prior to overlay evaluation, leaving only base predicates and types that may later be referenced during overlay evaluation. [#4082](https://github.com/github/vscode-codeql/pull/4082)
+
+## 1.17.4 - 10 July 2025
+
+- Fix variant analysis pack creation on some Windows systems [#4068](https://github.com/github/vscode-codeql/pull/4068)
+
+## 1.17.3 - 3 June 2025
+
 - Fix reporting of bad join orders in recursive predicates. [#4019](https://github.com/github/vscode-codeql/pull/4019)
 
 ## 1.17.2 - 27 March 2025

extensions/ql-vscode/gulpfile.ts/deploy.ts

@@ -4,6 +4,7 @@ import {
   mkdirs,
   readdir,
   unlinkSync,
+  rename,
   remove,
   writeFile,
 } from "fs-extra";
@@ -45,6 +46,10 @@ async function copyPackage(
       copyDirectory(resolve(sourcePath, file), resolve(destPath, file)),
     ),
   );
+
+  // The koffi directory needs to be located at the root of the package to ensure
+  // that the koffi package can find its native modules.
+  await rename(resolve(destPath, "out", "koffi"), resolve(destPath, "koffi"));
 }
 
 export async function deployPackage(): Promise<DeployedPackage> {

extensions/ql-vscode/gulpfile.ts/index.ts

@@ -5,7 +5,7 @@ import {
   checkTypeScript,
   watchCheckTypeScript,
   cleanOutput,
-  copyWasmFiles,
+  copyModules,
 } from "./typescript";
 import { compileTextMateGrammar } from "./textmate";
 import { packageExtension } from "./package";
@@ -21,7 +21,7 @@ export const buildWithoutPackage = series(
   cleanOutput,
   parallel(
     compileEsbuild,
-    copyWasmFiles,
+    copyModules,
     checkTypeScript,
     compileTextMateGrammar,
     compileViewEsbuild,
@@ -46,7 +46,7 @@ export {
   watchCheckTypeScript,
   watchViewEsbuild,
   compileEsbuild,
-  copyWasmFiles,
+  copyModules,
   checkTypeScript,
   injectAppInsightsKey,
   compileViewEsbuild,

extensions/ql-vscode/gulpfile.ts/typescript.ts

@@ -1,5 +1,5 @@
 import { gray, red } from "ansi-colors";
-import { dest, src, watch } from "gulp";
+import { dest, parallel, src, watch } from "gulp";
 import esbuild from "gulp-esbuild";
 import type { reporter } from "gulp-typescript";
 import { createProject } from "gulp-typescript";
@@ -71,7 +71,7 @@ export function watchCheckTypeScript() {
   watch(["src/**/*.ts", "!src/view/**/*.ts"], checkTypeScript);
 }
 
-export function copyWasmFiles() {
+function copyWasmFiles() {
   // We need to copy this file for the source-map package to work. Without this fie, the source-map
   // package is not able to load the WASM file because we are not including the full node_modules
   // directory. In version 0.7.4, it is not possible to call SourceMapConsumer.initialize in Node environments
@@ -83,3 +83,18 @@ export function copyWasmFiles() {
     encoding: false,
   }).pipe(dest("out"));
 }
+
+function copyNativeAddonFiles() {
+  // We need to copy these files manually because we only want to include Windows x64 to limit
+  // the size of the extension. Windows x64 is the most common platform that requires short path
+  // expansion, so we only include this platform.
+  // See src/common/short-paths.ts
+  return pipeline(
+    src("node_modules/koffi/build/koffi/win32_x64/*.node", {
+      encoding: false,
+    }),
+    dest("out/koffi/win32_x64"),
+  );
+}
+
+export const copyModules = parallel(copyWasmFiles, copyNativeAddonFiles);