Merge branch 'main' into switch-views

.fantasticonrc.js

@@ -12,10 +12,12 @@ const config = {
 	fontTypes: ['woff2'],
 	normalize: true,
 	// @ts-ignore
-	assetTypes: ['html', 'scss', 'json'],
+	assetTypes: ['html', 'scss', 'json', 'sass', 'css'],
 	templates: {
 		html: './images/icons/template/icons-contribution.hbs',
 		scss: './images/icons/template/styles.hbs',
+		sass: './images/icons/template/sass-map.hbs',
+		css: './images/icons/template/component-map.hbs',
 	},
 	formatOptions: {
 		json: {
@@ -25,8 +27,10 @@ const config = {
 	pathOptions: {
 		woff2: './dist/glicons.woff2',
 		scss: './dist/glicons.scss',
+		sass: './dist/glicons-map.scss',
 		html: './dist/icons-contribution.json',
 		json: './images/icons/template/mapping.json',
+		css: './dist/glicons-map.ts',
 	},
 };
 

.github/workflows/cd-pre.yml

@@ -54,14 +54,14 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-            - name: Setup pnpm
-              uses: pnpm/action-setup@v3
-              with:
-                  version: 8
             - name: Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: '20'
+                  node-version: '22'
+            - name: Setup pnpm
+              uses: pnpm/action-setup@v3
+              with:
+                  version: 9
             - name: Install
               run: pnpm install
             - name: Apply pre-release patch

.github/workflows/cd-stable.yml

@@ -14,14 +14,14 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-            - name: Setup pnpm
-              uses: pnpm/action-setup@v3
-              with:
-                  version: 8
             - name: Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: '20'
+                  node-version: '22'
+            - name: Setup pnpm
+              uses: pnpm/action-setup@v3
+              with:
+                  version: 9
             - 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

.prettierignore

@@ -4,8 +4,14 @@ out
 node_modules
 git.d.ts
 glicons.scss
+images/icons/template/component-map.hbs
 images/icons/template/icons-contribution.hbs
 images/icons/template/mapping.json
+images/icons/template/sass-map.hbs
 images/icons/template/styles.hbs
 src/emojis.generated.ts
+src/webviews/apps/shared/components/icons/codicons-map.ts
+src/webviews/apps/shared/components/icons/glicons-map.ts
+src/webviews/apps/shared/styles/icons/codicons-map.scss
+src/webviews/apps/shared/styles/icons/glicons-map.scss
 pnpm-lock.yaml

.vscode/tasks.json

@@ -41,6 +41,18 @@
 			},
 			"problemMatcher": ["$ts-checker-webpack-watch", "$ts-checker-eslint-webpack-watch"]
 		},
+		{
+			"type": "npm",
+			"script": "watch:quick",
+			"group": {
+				"kind": "build"
+			},
+			"isBackground": true,
+			"presentation": {
+				"group": "watchers"
+			},
+			"problemMatcher": ["$ts-checker-webpack-watch"]
+		},
 		{
 			"label": "Install dependencies",
 			"type": "shell",

CHANGELOG.md

@@ -8,7 +8,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Added
 
+- Adds Holiday promotion
 - Adds the ability to get autolinks for branches via the branch name — closes [#3547](https://github.com/gitkraken/vscode-gitlens/issues/3547)
+- Adds GitLab issues to the issues list in the _Start Work_ command when GitLab is connected — closes [#3779](https://github.com/gitkraken/vscode-gitlens/issues/3779)
+- Adds `gitlens.advanced.caching.gitPath` setting to specify whether to cache the git path — closes [#2877](https://github.com/gitkraken/vscode-gitlens/issues/2877)
+
+### Changed
+
+- Updates prep-release reference — thanks to [PR #3732](https://github.com/gitkraken/vscode-gitlens/pull/3732) by Emmanuel Ferdman ([@emmanuel-ferdman](https://github.com/emmanuel-ferdman))
 
 ## [16.0.4] - 2024-11-25
 

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/), `>= v20.11.1`
-- [pnpm](https://pnpm.io/), `>= 8.x` (install using [corepack](https://nodejs.org/docs/latest-v20.x/api/corepack.html))
+- [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))
 
 ### Dependencies
 
@@ -198,7 +198,7 @@ Before publishing a new release, do the following:
 3. Ensure all items in the `{major}.{minor}` GitHub milestone are closed and verified or moved into one of the above milestones
 4. Close the `{major}.{minor}` and `{major}.{minor-1}-patch` GitHub milestones
 
-Then, use the [prep-release](scripts/prep-release.js) script to prepare a new release. The script updates the [package.json](package.json) and [CHANGELOG.md](CHANGELOG.md) appropriately, commits the changes as `Bumps to v{major}.{minor}.{patch}`, and creates a `v{major}.{minor}.{patch}` tag which when pushed will trigger the CI to publish a release.
+Then, use the [prep-release](scripts/prep-release.mjs) script to prepare a new release. The script updates the [package.json](package.json) and [CHANGELOG.md](CHANGELOG.md) appropriately, commits the changes as `Bumps to v{major}.{minor}.{patch}`, and creates a `v{major}.{minor}.{patch}` tag which when pushed will trigger the CI to publish a release.
 
 1. Ensure you are on the `main` branch and have a clean working tree
 2. Ensure the [CHANGELOG.md](CHANGELOG.md) has been updated with the release notes

README.md

@@ -434,6 +434,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - Tyler Johnson ([@TJohnsonSE](https://github.com/TJohnsonSE)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=TJohnsonSE)
 - Jean Pierre ([@jeanp413](https://github.com/jeanp413)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jeanp413)
 - Dawn Hwang ([@hwangh95](https://github.com/hwangh95)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=hwangh95)
+- Emmanuel Ferdman ([@emmanuel-ferdman](https://github.com/emmanuel-ferdman)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=emmanuel-ferdman)
 
 Also special thanks to the people that have provided support, testing, brainstorming, etc:
 

ThirdPartyNotices.txt

@@ -13,17 +13,17 @@ This project incorporates components from the projects listed below.
 8. @octokit/request version 9.1.3 (https://github.com/octokit/request.js)
 9. @octokit/types version 13.6.1 (https://github.com/octokit/types.ts)
 10. @opentelemetry/api version 1.9.0 (https://github.com/open-telemetry/opentelemetry-js)
-11. @opentelemetry/exporter-trace-otlp-http version 0.55.0 (https://github.com/open-telemetry/opentelemetry-js)
-12. @opentelemetry/resources version 1.28.0 (https://github.com/open-telemetry/opentelemetry-js)
-13. @opentelemetry/sdk-trace-base version 1.28.0 (https://github.com/open-telemetry/opentelemetry-js)
+11. @opentelemetry/exporter-trace-otlp-http version 0.56.0 (https://github.com/open-telemetry/opentelemetry-js)
+12. @opentelemetry/resources version 1.29.0 (https://github.com/open-telemetry/opentelemetry-js)
+13. @opentelemetry/sdk-trace-base version 1.29.0 (https://github.com/open-telemetry/opentelemetry-js)
 14. @opentelemetry/semantic-conventions version 1.28.0 (https://github.com/open-telemetry/opentelemetry-js)
 15. @shoelace-style/shoelace version 2.18.0 (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.1 (https://github.com/naver/billboard.js)
+17. billboard.js version 3.14.2 (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.2 (https://github.com/markedjs/marked)
+21. marked version 15.0.3 (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)