From a1383f824d132bc2067841e77492c52b73fe6bdd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 28 Oct 2025 12:26:40 +0000 Subject: [PATCH 1/2] Bump Node version to v22.19.0 --- extensions/ql-vscode/.nvmrc | 2 +- extensions/ql-vscode/package-lock.json | 10 +++++----- extensions/ql-vscode/package.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/ql-vscode/.nvmrc b/extensions/ql-vscode/.nvmrc index 6edc5a20f3f..2c6984e9467 100644 --- a/extensions/ql-vscode/.nvmrc +++ b/extensions/ql-vscode/.nvmrc @@ -1 +1 @@ -v22.17.0 +v22.19.0 diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 3e72e13ace7..37d662007b8 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -82,7 +82,7 @@ "@types/gulp": "^4.0.9", "@types/jest": "^29.5.12", "@types/js-yaml": "^4.0.6", - "@types/node": "22.17.*", + "@types/node": "22.18.*", "@types/proper-lockfile": "^4.1.4", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", @@ -143,7 +143,7 @@ "vite-node": "^3.0.7" }, "engines": { - "node": "^22.17.0", + "node": "^22.19.0", "npm": ">=7.20.6", "vscode": "^1.90.0" } @@ -8188,9 +8188,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.17.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.2.tgz", - "integrity": "sha512-gL6z5N9Jm9mhY+U2KXZpteb+09zyffliRkZyZOHODGATyC5B1Jt/7TzuuiLkFsSUMLbS1OLmlj/E+/3KF4Q/4w==", + "version": "22.18.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.12.tgz", + "integrity": "sha512-BICHQ67iqxQGFSzfCFTT7MRQ5XcBjG5aeKh5Ok38UBbPe5fxTyE+aHFxwVrGyr8GNlqFMLKD1D3P2K/1ks8tog==", "dev": true, "license": "MIT", "dependencies": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index c85152a87b4..d80efe1594b 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -14,7 +14,7 @@ }, "engines": { "vscode": "^1.90.0", - "node": "^22.17.0", + "node": "^22.19.0", "npm": ">=7.20.6" }, "categories": [ @@ -2074,7 +2074,7 @@ "@types/gulp": "^4.0.9", "@types/jest": "^29.5.12", "@types/js-yaml": "^4.0.6", - "@types/node": "22.17.*", + "@types/node": "22.18.*", "@types/proper-lockfile": "^4.1.4", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", From b6c04edd1fa2251ff41bd44395433bec3cea8dfd Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Tue, 28 Oct 2025 13:41:34 +0100 Subject: [PATCH 2/2] Fix Jest with Node 22.18 --- .vscode/settings.json | 12 +++++++----- extensions/ql-vscode/package.json | 12 ++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f61c6b3dc55..17ed8c1332d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,7 +40,8 @@ "jest.autoRun": "off", "jest.nodeEnv": { "LANG": "en-US", - "TZ": "UTC" + "TZ": "UTC", + "NODE_OPTIONS": "--no-experimental-strip-types" }, // These custom rules are read in extensions/ql-vscode/.markdownlint-cli2.cjs @@ -79,6 +80,7 @@ "env": { "LANG": "en-US", "TZ": "UTC", + "NODE_OPTIONS": "--no-experimental-strip-types", // Uncomment to set a custom path to a CodeQL checkout. // "TEST_CODEQL_PATH": "/absolute/path/to/checkout/of/codeql", @@ -88,7 +90,7 @@ // "CLI_PATH": "/absolute/path/to/custom/codeql", // Uncomment to debug integration tests - "VSCODE_WAIT_FOR_DEBUGGER": "true", + "VSCODE_WAIT_FOR_DEBUGGER": "true" } }, "terminal.integrated.env.linux": { @@ -105,10 +107,10 @@ }, "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, + "editor.formatOnSave": true }, "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true, - }, + "editor.formatOnSave": true + } } diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index d80efe1594b..efdcee3ae9a 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -1976,13 +1976,13 @@ "build": "gulp", "watch": "gulp watch", "test": "npm-run-all test:*", - "test:unit": "cross-env TZ=UTC LANG=en-US jest --projects test/unit-tests", - "test:view": "jest --projects src/view", + "test:unit": "cross-env TZ=UTC LANG=en-US NODE_OPTIONS=--no-experimental-strip-types jest --projects test/unit-tests", + "test:view": "cross-env NODE_OPTIONS=--no-experimental-strip-types jest --projects src/view", "test:vscode-integration": "npm-run-all test:vscode-integration:*", - "test:vscode-integration:activated-extension": "jest --projects test/vscode-tests/activated-extension", - "test:vscode-integration:no-workspace": "jest --projects test/vscode-tests/no-workspace", - "test:vscode-integration:minimal-workspace": "jest --projects test/vscode-tests/minimal-workspace", - "test:cli-integration": "jest --projects test/vscode-tests/cli-integration --verbose", + "test:vscode-integration:activated-extension": "cross-env NODE_OPTIONS=--no-experimental-strip-types jest --projects test/vscode-tests/activated-extension", + "test:vscode-integration:no-workspace": "cross-env NODE_OPTIONS=--no-experimental-strip-types jest --projects test/vscode-tests/no-workspace", + "test:vscode-integration:minimal-workspace": "cross-env NODE_OPTIONS=--no-experimental-strip-types jest --projects test/vscode-tests/minimal-workspace", + "test:cli-integration": "cross-env NODE_OPTIONS=--no-experimental-strip-types jest --projects test/vscode-tests/cli-integration --verbose", "clean-test-dir": "find . -type d -name .vscode-test -exec rm -r {} +", "update-vscode": "node ./node_modules/vscode/bin/install", "format": "prettier --write **/*.{ts,tsx} && eslint . --fix",