Merge remote-tracking branch 'origin/main' into pr/dnicolson/532

Author: aeschli

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

build/pipeline.yml

@@ -34,16 +34,16 @@ extends:
         testPlatforms:
           - name: Linux
             nodeVersions:
-              - 18.x
               - 20.x
+              - 22.x
           - name: MacOS
             nodeVersions:
-              - 18.x
               - 20.x
+              - 22.x
           - name: Windows
             nodeVersions:
-              - 18.x
               - 20.x
+              - 22.x
 
         testSteps:
           - script: npm i

generators/app/dependencyVersions/package.json

@@ -7,31 +7,31 @@
         "@types/mocha": "^10.0.10",
         "@types/node": "22.x",
         "@types/assert": "^1.5.11",
-        "typescript-eslint": "^8.39.0",
-        "eslint": "^9.32.0",
+        "typescript-eslint": "^8.46.3",
+        "eslint": "^9.39.1",
         "glob": "^11.0.3",
-        "mocha": "^11.7.1",
-        "typescript": "^5.9.2",
+        "mocha": "^11.7.4",
+        "typescript": "^5.9.3",
         "@vscode/test-cli": "^0.0.11",
         "@vscode/test-electron": "^2.5.2",
-        "@vscode/test-web": "^0.0.72",
+        "@vscode/test-web": "^0.0.74",
         "@types/webpack-env": "^1.18.8",
-        "@types/vscode-notebook-renderer": "^1.72.3",
-        "concurrently": "^9.2.0",
+        "@types/vscode-notebook-renderer": "^1.72.4",
+        "concurrently": "^9.2.1",
         "css-loader": "^7.1.2",
         "fork-ts-checker-webpack-plugin": "^9.1.0",
         "style-loader": "^4.0.0",
-        "ts-loader": "^9.5.2",
+        "ts-loader": "^9.5.4",
         "vscode-dts": "^0.3.3",
         "vscode-notebook-error-overlay": "^1.1.0",
-        "webpack": "^5.101.0",
+        "webpack": "^5.102.0",
         "util": "^0.12.5",
         "webpack-cli": "^6.0.1",
         "webpack-dev-server": "^5.2.2",
         "assert": "^2.1.0",
         "process": "^0.11.10",
         "npm-run-all": "^4.1.5",
-        "esbuild": "^0.25.8",
+        "esbuild": "^0.25.10",
         "@esbuild-plugins/node-globals-polyfill": "^0.2.3"
     }
 }

generators/app/env.js

@@ -7,34 +7,38 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
 
-const fallbackVersion = '^1.54.0';
+const fallbackVersion = '^1.103.0';
 let versionPromise = undefined;
 
 export function getLatestVSCodeVersion() {
     if (!versionPromise) {
-        versionPromise = request.xhr({ url: 'https://update.code.visualstudio.com/api/releases/stable', headers: { "X-API-Version": "2" } }).then(res => {
-            if (res.status === 200) {
-                try {
-                    var tagsAndCommits = JSON.parse(res.responseText);
-                    if (Array.isArray(tagsAndCommits) && tagsAndCommits.length > 0) {
-                        var segments = tagsAndCommits[0].version.split('.');
-                        if (segments.length === 3) {
-                            return '^' + segments[0] + '.' + segments[1] + '.0';
+        // Fetch the latest published @types/vscode version from the npm registry
+        // and return a caret-pinned range (e.g. ^1.93.0).
+        versionPromise = request
+            .xhr({ url: 'https://registry.npmjs.org/@types/vscode/latest', headers: { 'Accept': 'application/json' } })
+            .then(
+                res => {
+                    if (res.status === 200) {
+                        try {
+                            const meta = JSON.parse(res.responseText);
+                            if (meta && typeof meta.version === 'string' && meta.version) {
+                                return '^' + meta.version;
+                            }
+                        } catch (e) {
+                            console.log('Problem parsing @types/vscode metadata: ' + res.responseText, e);
                         }
+                    } else {
+                        console.warn('Unable to evaluate the latest @types/vscode version: Status code: ' + res.status + ', ' + res.responseText);
                     }
-                } catch (e) {
-                    console.log('Problem parsing version: ' + res.responseText, e);
+                    console.warn('Falling back to: ' + fallbackVersion);
+                    return fallbackVersion;
+                },
+                err => {
+                    console.warn('Unable to evaluate the latest @types/vscode version: Error: ', err);
+                    console.warn('Falling back to: ' + fallbackVersion);
+                    return fallbackVersion;
                 }
-            } else {
-                console.warn('Unable to evaluate the latest vscode version: Status code: ' + res.status + ', ' + res.responseText);
-            }
-            console.warn('Falling back to: ' + fallbackVersion);
-            return fallbackVersion;
-        }, err => {
-            console.warn('Unable to evaluate the latest vscode version: Error: ', err);
-            console.warn('Falling back to: ' + fallbackVersion);
-            return fallbackVersion;
-        });
+            );
     }
     return versionPromise;
 };