Merge branch 'gitkraken:main' into main

.github/workflows/cd-pre.yml

@@ -61,7 +61,7 @@ jobs:
             - name: Setup pnpm
               uses: pnpm/action-setup@v3
               with:
-                  version: 9
+                  version: 10
             - name: Install
               run: pnpm install
             - name: Apply pre-release patch

.github/workflows/cd-stable.yml

@@ -21,7 +21,7 @@ jobs:
             - name: Setup pnpm
               uses: pnpm/action-setup@v3
               with:
-                  version: 9
+                  version: 10
             - name: Setup Environment
               run: node -e "console.log('PACKAGE_VERSION=' + require('./package.json').version + '\nPACKAGE_NAME=' + require('./package.json').name + '-' + require('./package.json').version)" >> $GITHUB_ENV
             - name: Verify versions

CHANGELOG.md

@@ -13,8 +13,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
-- Fixes [#3911](https://github.com/gitkraken/vscode-gitlens/issues/#3911) - Avoid Home opening when first-install isn't reliable (e.g. GitPod)
-- Fixes [#3888](https://github.com/gitkraken/vscode-gitlens/issues/#3888) - Graph hover should disappear when right-clicking a row
+- Fixes [#3915](https://github.com/gitkraken/vscode-gitlens/issues/3915) - Closing a split editor with annotations causes the Clear Annotations button to get stuck
+- Fixes [#3914](https://github.com/gitkraken/vscode-gitlens/issues/3914) - Attempting to clear a file annotation on a split file w/o the annotation no-ops
+- Fixes [#3911](https://github.com/gitkraken/vscode-gitlens/issues/3911) - Avoid Home opening when first-install isn't reliable (e.g. GitPod)
+- Fixes [#3888](https://github.com/gitkraken/vscode-gitlens/issues/3888) - Graph hover should disappear when right-clicking a row
 
 ## [16.1.1] - 2024-12-20
 
@@ -28,7 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
-- Fixes [#3899](https://github.com/gitkraken/vscode-gitlens/issues/#3899) - custom autolinks not being detected
+- Fixes [#3899](https://github.com/gitkraken/vscode-gitlens/issues/3899) - custom autolinks not being detected
 - Fixes owner avatars from getting lost (progressively) on refresh of the _Home_ view
 - Fixes launchpad status icon for 'waiting for review' state on _Home_
 - Fixes missing _Delete Branch..._ command from branches on worktrees in the _Branches_ view

CONTRIBUTING.md

@@ -19,8 +19,8 @@ git clone https://github.com/gitkraken/vscode-gitlens.git
 Prerequisites
 
 - [Git](https://git-scm.com/), `>= 2.7.2`
-- [NodeJS](https://nodejs.org/), `>= v22.11.0`
-- [pnpm](https://pnpm.io/), `>= 9.x` (install using [corepack](https://nodejs.org/docs/latest-v20.x/api/corepack.html))
+- [NodeJS](https://nodejs.org/), `>= 22.12.0`
+- [pnpm](https://pnpm.io/), `>= 10.x` (install using [corepack](https://nodejs.org/docs/latest-v20.x/api/corepack.html))
 
 ### Dependencies
 

ThirdPartyNotices.txt

@@ -19,18 +19,18 @@ This project incorporates components from the projects listed below.
 14. @opentelemetry/semantic-conventions version 1.28.0 (https://github.com/open-telemetry/opentelemetry-js)
 15. @shoelace-style/shoelace version 2.19.1 (https://github.com/shoelace-style/shoelace)
 16. @vscode/codicons version 0.0.36 (https://github.com/microsoft/vscode-codicons)
-17. billboard.js version 3.14.2 (https://github.com/naver/billboard.js)
+17. billboard.js version 3.14.3 (https://github.com/naver/billboard.js)
 18. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
 19. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
 20. lit version 3.2.1 (https://github.com/lit/lit)
-21. marked version 15.0.5 (https://github.com/markedjs/marked)
+21. marked version 15.0.6 (https://github.com/markedjs/marked)
 22. microsoft/vscode (https://github.com/microsoft/vscode)
 23. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
 24. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)
 25. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify)
 26. react-dom version 16.8.4 (https://github.com/facebook/react)
 27. react version 16.8.4 (https://github.com/facebook/react)
-28. signal-utils version 0.20.0 (https://github.com/proposal-signals/signal-utils)
+28. signal-utils version 0.21.1 (https://github.com/proposal-signals/signal-utils)
 29. slug version 10.0.0 (https://github.com/Trott/slug)
 30. sortablejs version 1.15.0 (https://github.com/SortableJS/Sortable)
 

package.json

@@ -4,6 +4,8 @@
 	"description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more",
 	"version": "16.1.1",
 	"engines": {
+		"node": ">= 22.12.0",
+		"pnpm": ">= 10.0.0",
 		"vscode": "^1.82.0"
 	},
 	"license": "SEE LICENSE IN LICENSE",
@@ -19940,6 +19942,9 @@
 	},
 	"scripts": {
 		"analyze:bundle": "webpack --mode production --env analyzeBundle",
+		"analyze:bundle:extension": "webpack --mode production --config-name extension:node --env analyzeBundle",
+		"analyze:bundle:extension:browser": "webpack --mode production --config-name extension:webworker --env analyzeBundle",
+		"analyze:bundle:webviews": "webpack --mode production --config-name webviews --env analyzeBundle",
 		"analyze:deps": "webpack --env analyzeDeps",
 		"build": "webpack --mode development",
 		"build:quick": "webpack --mode development --env skipLint",
@@ -20018,23 +20023,23 @@
 		"@opentelemetry/semantic-conventions": "1.28.0",
 		"@shoelace-style/shoelace": "2.19.1",
 		"@vscode/codicons": "0.0.36",
-		"billboard.js": "3.14.2",
+		"billboard.js": "3.14.3",
 		"https-proxy-agent": "5.0.1",
 		"iconv-lite": "0.6.3",
 		"lit": "3.2.1",
-		"marked": "15.0.5",
+		"marked": "15.0.6",
 		"node-fetch": "2.7.0",
 		"os-browserify": "0.3.0",
 		"path-browserify": "1.0.1",
 		"react": "16.8.4",
 		"react-dom": "16.8.4",
-		"signal-utils": "0.20.0",
+		"signal-utils": "0.21.1",
 		"slug": "10.0.0",
 		"sortablejs": "1.15.0"
 	},
 	"devDependencies": {
 		"@eamodio/eslint-lite-webpack-plugin": "0.2.0",
-		"@eslint/js": "9.16.0",
+		"@eslint/js": "9.17.0",
 		"@playwright/test": "1.49.1",
 		"@swc/core": "1.10.4",
 		"@twbs/fantasticon": "3.0.0",
@@ -20046,7 +20051,7 @@
 		"@types/slug": "5.0.9",
 		"@types/sortablejs": "1.15.8",
 		"@types/vscode": "1.82.0",
-		"@typescript-eslint/parser": "8.19.0",
+		"@typescript-eslint/parser": "8.19.1",
 		"@vscode/test-cli": "^0.0.10",
 		"@vscode/test-electron": "2.4.1",
 		"@vscode/test-web": "0.0.65",
@@ -20083,15 +20088,15 @@
 		"playwright": "1.49.1",
 		"prettier": "3.1.0",
 		"regex-to-strings": "2.1.0",
-		"sass": "1.82.0",
+		"sass": "1.83.1",
 		"sass-loader": "16.0.4",
 		"schema-utils": "4.3.0",
-		"sharp": "0.32.6",
+		"sharp": "0.33.5",
 		"svgo": "3.3.2",
 		"terser-webpack-plugin": "5.3.11",
 		"ts-loader": "9.5.1",
 		"typescript": "5.7.2",
-		"typescript-eslint": "8.19.0",
+		"typescript-eslint": "8.19.1",
 		"webpack": "5.97.1",
 		"webpack-bundle-analyzer": "4.10.2",
 		"webpack-cli": "6.0.1",
@@ -20104,5 +20109,5 @@
 		"node-fetch": "2.7.0",
 		"semver-regex": "4.0.5"
 	},
-	"packageManager": "pnpm@10.0.0-rc.2"
+	"packageManager": "pnpm@10.0.0"
 }