Merge branch 'main' into run-venv-jedi

Author: eleanorjboyd

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:18-bookworm
+FROM mcr.microsoft.com/devcontainers/typescript-node:22-bookworm
 
 RUN apt-get install -y wget bzip2
 

.github/workflows/build.yml

@@ -11,7 +11,7 @@ on:
 permissions: {}
 
 env:
-  NODE_VERSION: 22.17.0
+  NODE_VERSION: 22.21.1
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   # Force a path with spaces and to test extension works in these scenarios
   # Unicode characters are causing 2.7 failures so skip that for now.

.github/workflows/pr-check.yml

@@ -10,7 +10,7 @@ on:
 permissions: {}
 
 env:
-  NODE_VERSION: 22.17.0
+  NODE_VERSION: 22.21.1
   PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
   ARTIFACT_NAME_VSIX: ms-python-insiders-vsix

.nvmrc

@@ -1 +1 @@
-v20.18.0
+v22.21.1

.vscode/tasks.json

@@ -39,6 +39,24 @@
             "problemMatcher": ["$python"],
             "label": "npm: check-python",
             "detail": "npm run check-python:ruff && npm run check-python:pyright"
+        },
+        {
+            "label": "npm: check-python (venv)",
+            "type": "shell",
+            "command": "bash",
+            "args": ["-lc", "source .venv/bin/activate && npm run check-python"],
+            "problemMatcher": [],
+            "detail": "Activates the repo .venv first (avoids pyenv/shim Python) then runs: npm run check-python",
+            "windows": {
+                "command": "pwsh",
+                "args": [
+                    "-NoProfile",
+                    "-ExecutionPolicy",
+                    "Bypass",
+                    "-Command",
+                    ".\\.venv\\Scripts\\Activate.ps1; npm run check-python"
+                ]
+            }
         }
     ]
 }

build/azure-pipeline.stable.yml

@@ -128,7 +128,7 @@ extends:
           project: 'Monaco'
           definition: 593
           buildVersionToDownload: 'latestFromBranch'
-          branchName: 'refs/heads/release/2025.16'
+          branchName: 'refs/heads/release/2026.0'
           targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
           artifactName: 'bin-$(buildTarget)'
           itemPattern: |

build/azure-pipelines/pipeline.yml

@@ -37,13 +37,13 @@ extends:
         testPlatforms:
           - name: Linux
             nodeVersions:
-              - 22.17.0
+              - 22.21.1
           - name: MacOS
             nodeVersions:
-              - 22.17.0
+              - 22.21.1
           - name: Windows
             nodeVersions:
-              - 22.17.0
+              - 22.21.1
         testSteps:
           - template: /build/azure-pipelines/templates/test-steps.yml@self
             parameters:

package-lock.json

@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Python language support with extension access points for IntelliSense (Pylance), Debugging (Python Debugger), linting, formatting, refactoring, unit tests, and more.",
-    "version": "2025.21.0-dev",
+    "version": "2026.1.0-dev",
     "featureFlags": {
         "usingNewInterpreterStorage": true
     },
@@ -1752,7 +1752,7 @@
         "@types/glob": "^7.2.0",
         "@types/lodash": "^4.14.104",
         "@types/mocha": "^9.1.0",
-        "@types/node": "^22.5.0",
+        "@types/node": "^22.19.1",
         "@types/semver": "^5.5.0",
         "@types/shortid": "^0.0.29",
         "@types/sinon": "^17.0.3",

package.json

@@ -13,7 +13,7 @@
     "main": "./out/main.js",
     "types": "./out/main.d.ts",
     "engines": {
-        "node": ">=22.17.0",
+        "node": ">=22.21.1",
         "vscode": "^1.93.0"
     },
     "license": "MIT",