Skip to content

Commit 383579d

Browse files
authored
Fix fetch call for VS Code before 1.82.0. (#11683)
1 parent 5325b37 commit 383579d

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

Extension/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "1.18.3-main",
5+
"version": "1.18.4-main",
66
"publisher": "ms-vscode",
77
"icon": "LanguageCCPP_color_128x.png",
88
"readme": "README.md",
@@ -6312,6 +6312,7 @@
63126312
"@types/mkdirp": "^0.5.2",
63136313
"@types/mocha": "^10.0.1",
63146314
"@types/node": "^18.11.9",
6315+
"@types/node-fetch": "^2.6.9",
63156316
"@types/plist": "^3.0.2",
63166317
"@types/semver": "^7.1.0",
63176318
"@types/shell-quote": "^1.7.1",

Extension/src/LanguageServer/extension.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,6 +1181,8 @@ export async function preReleaseCheck(): Promise<void> {
11811181
// First we need to make sure the user isn't already on a pre-release version and hasn't dismissed this prompt before.
11821182
if (!isOnPreRelease.Value && !displayedPreReleasePrompt.Value && util.getCppToolsTargetPopulation() === TargetPopulation.Public) {
11831183
// Get the info on the latest version from the marketplace to check if there is a pre-release version available.
1184+
const nodeFetch = await import('node-fetch'); // dynamic import is required
1185+
const fetch = nodeFetch.default; // Node.js 18 fetch isn't available until VS 1.82.
11841186
const response = await fetch('https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery', {
11851187
method: 'POST',
11861188
headers: {

Extension/yarn.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,14 @@
400400
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.1.tgz#2f4f65bb08bc368ac39c96da7b2f09140b26851b"
401401
integrity sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==
402402

403+
"@types/node-fetch@^2.6.9":
404+
version "2.6.9"
405+
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.9.tgz#15f529d247f1ede1824f7e7acdaa192d5f28071e"
406+
integrity sha512-bQVlnMLFJ2d35DkPNjEPmd9ueO/rh5EiaZt2bhqiSarPjZIuIV6bPQVqcrEyvNo+AfTrRGVazle1tl597w3gfA==
407+
dependencies:
408+
"@types/node" "*"
409+
form-data "^4.0.0"
410+
403411
"@types/node@*":
404412
version "20.4.1"
405413
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.1.tgz#a6033a8718653c50ac4962977e14d0f984d9527d"

0 commit comments

Comments
 (0)