Merge remote-tracking branch 'origin'

Author: mogelbrod

.eslintrc.base.json

@@ -5,7 +5,6 @@
 	"extends": [
 		"eslint:recommended",
 		"plugin:@typescript-eslint/strict-type-checked",
-		"plugin:@typescript-eslint/stylistic-type-checked",
 		"plugin:import/recommended",
 		"plugin:import/typescript",
 		"prettier"
@@ -24,33 +23,25 @@
 	"root": true,
 	"rules": {
 		"anti-trojan-source/no-bidi": "error",
-		"arrow-parens": ["off"],
-		"brace-style": ["off", "stroustrup"],
-		"consistent-return": "off",
-		"curly": ["error", "multi-line", "consistent"],
-		"eol-last": "error",
-		"linebreak-style": ["error", "unix"],
-		"new-parens": "error",
-		"no-console": "off",
 		"no-constant-condition": ["warn", { "checkLoops": false }],
 		"no-constant-binary-expression": "error",
 		"no-caller": "error",
 		"no-debugger": "off",
-		"no-dupe-class-members": "off",
 		"no-else-return": "warn",
 		"no-empty": ["warn", { "allowEmptyCatch": true }],
 		"no-eval": "error",
 		"no-ex-assign": "warn",
 		"no-extend-native": "error",
 		"no-extra-bind": "error",
+		"no-extra-semi": "off",
 		"no-floating-decimal": "error",
 		"no-implicit-coercion": "error",
 		"no-implied-eval": "error",
 		"no-inner-declarations": "off",
 		"no-lone-blocks": "error",
 		"no-lonely-if": "error",
 		"no-loop-func": "error",
-		"no-multi-spaces": "error",
+		"no-mixed-spaces-and-tabs": "off",
 		"no-restricted-globals": ["error", "process"],
 		"no-restricted-imports": [
 			"error",
@@ -98,8 +89,13 @@
 						"message": "Use @env/ instead"
 					},
 					{
-						"group": ["src/**/*"],
+						"group": ["src/*"],
 						"message": "Use relative paths instead"
+					},
+					{
+						"group": ["react-dom"],
+						"importNames": ["Container"],
+						"message": "Use our Container instead"
 					}
 				]
 			}
@@ -138,10 +134,7 @@
 		"prefer-rest-params": "error",
 		"prefer-spread": "error",
 		"prefer-template": "error",
-		"quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
 		"require-atomic-updates": "off",
-		"semi": ["error", "always"],
-		"semi-style": ["error", "last"],
 		"sort-imports": [
 			"error",
 			{
@@ -153,7 +146,7 @@
 		],
 		"yoda": "error",
 		"import/consistent-type-specifier-style": ["error", "prefer-top-level"],
-		"import/extensions": ["error", "never"],
+		"import/extensions": "off",
 		"import/newline-after-import": "warn",
 		"import/no-absolute-path": "error",
 		"import/no-cycle": "off",
@@ -326,7 +319,22 @@
 		{
 			"files": ["src/env/node/**/*"],
 			"rules": {
-				"no-restricted-imports": "off"
+				"no-restricted-imports": [
+					"error",
+					{
+						"patterns": [
+							{
+								"group": ["src/*"],
+								"message": "Use relative paths instead"
+							},
+							{
+								"group": ["react-dom"],
+								"importNames": ["Container"],
+								"message": "Use our Container instead"
+							}
+						]
+					}
+				]
 			}
 		}
 	]

.fantasticonrc.js

@@ -1,6 +1,6 @@
 //@ts-check
 
-/** @type { import('fantasticon').RunnerOptions} } */
+/** @type { import('@twbs/fantasticon').RunnerOptions} } */
 const config = {
 	name: 'glicons',
 	prefix: 'glicon',

.git-blame-ignore-revs

@@ -8,3 +8,4 @@ d790e9db047769de079f6838c3578f3a47bf5930
 9c2df377d3e1842ed09eea5bb99be00edee9ca9c
 444bf829156b3170c8b4b5156dcf10b06db83779
 4dba4612670c0a942e3daa3e6a34a57aebe257ae
+fbccf2428fd671378202de43ff99deff66168a13

.prettierrc

@@ -14,10 +14,6 @@
 		{
 			"files": "*.md",
 			"options": { "tabWidth": 2 }
-		},
-		{
-			"files": "*.svg",
-			"options": { "parser": "html" }
 		}
 	]
 }

.vscode/settings.json

@@ -1,8 +1,7 @@
 {
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
-	"eslint.packageManager": "yarn",
 	"files.associations": {
 		".eslintrc*.json": "jsonc"
 	},

CHANGELOG.md

@@ -170,7 +170,9 @@ If this is your first contribution to GitLens, please give yourself credit by ad
 
 ## Publishing
 
-### Versioning
+### Stable Releases
+
+#### Versioning
 
 GitLens version changes are bucketed into two types:
 
@@ -179,40 +181,39 @@ GitLens version changes are bucketed into two types:
 
 <small>Note: `major` version bumps are only considered for more special circumstances.</small>
 
-#### Updating the CHANGELOG
-
-All recent changes are listed under `## [Unreleased]`. This title and corresponding link at the bottom of the page will need to be updated.
-
-The title should be updated to the upcoming version and the release date (YYYY-MM-DD):
+#### Preparing
 
-```markdown
-<!-- from: -->
+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.
 
-## [Unreleased]
+1. Ensure you are on a clean working tree
+2. Run `yarn run prep-release` and enter the desired version when prompted.
+3. Review the `Bumps to v<major.minor.patch>` commit
+4. Run `git push --follow-tags` to push the commit and tag
 
-<!-- to: -->
-
-## [12.1.0] - 2022-06-14
-```
+Pushing the `v<major.minor.patch>` tag will trigger the [Publish Stable workflow](.github/workflows/cd-stable.yml) to automatically package the extension, create a [GitHub release](https://github.com/gitkraken/vscode-gitlens/releases/latest), and deploy it to the [VS Marketplace](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens).
 
-Stage this file so it will be included with the version commit.
+If the action fails and retries are unsuccessful, the VSIX can be built locally with `yarn package` and uploaded manually to the marketplace. A GitHub release can also be [created manually](https://github.com/gitkraken/vscode-gitlens/releases/new) using `v<major.minor.patch>` as the title and the notes from the [CHANGELOG.md](CHANGELOG.md) with the VSIX attached.
 
-#### Version Commit
+### Pre-releases
 
-Run `yarn version` and enter the upcoming version when prompted.
+The [Publish Pre-release workflow](.github/workflows/cd-pre.yml) is automatically run every AM unless no new changes have been committed to `main`.
 
-Once the commit is completed, run `git push --follow-tags` to push the version commit and the newly generated tags.
+### Insiders (deprecated use pre-release instead)
 
-### GitHub Actions and Deployment
+The Publish Insiders workflow is no longer available and was replaced with the pre-release edition.
 
-After the version commit and new tags are pushed to GitHub, the [Publish Stable workflow](.github/workflows/cd-stable.yml) will be triggered, which will automatically package the extension and deploy it to the [VS Marketplace](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens). The [release notes](https://github.com/gitkraken/vscode-gitlens/releases/latest) _should_ be generated during the action, but if not, this can be done manually using the notes from the [Change Log](CHANGELOG.md).
+## Updating GL Icons
 
-If the action fails, the VSIX will need to be built locally with `yarn package` and uploaded manually in the marketplace.
+To add new icons to the GL Icons font follow the steps below:
 
-### Pre-release edition
+- Add new SVG icons to the `images/icons` folder
+- Update the `images/icons/template/mapping.json` file with entries for the new icons (append to the end of the file)
+- Optimize and build the icons by running the following from a terminal:
 
-The [Publish Pre-release workflow](.github/workflows/cd-pre.yml) is automatically run every AM unless no new changes have been committed to `main`.
+  ```
+  yarn run icons:svgo
+  yarn run build:icons
 
-### Insiders edition (deprecated use pre-release instead)
+  ```
 
-The Publish Insiders workflow is no longer available and was replaced with the pre-release edition.
+Once you've finshed copy the new `glicons.woff2?<uuid>` URL from `src/webviews/apps/shared/glicons.scss` and search and replace the old references with the new one.

CONTRIBUTING.md

@@ -23,13 +23,13 @@ Use `Switch to Pre-Release Version` on the extension banner to live on the edge
 All features are free to use on all repos, **except** for features,
 
 - marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos
-- marked with a ☁️ require a GitKraken Account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc
+- marked with a ☁️ require a GitKraken account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc
 
 See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details.
 
 [Features](#discover-powerful-features 'Jump to Discover Powerful Features')
 | [Labs](#gitkraken-labs 'Jump to GitKraken Labs')
-| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitLens Pro?')
+| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitKraken Pro?')
 | [FAQ](#faq 'Jump to FAQ')
 | [Support and Community](#support-and-community 'Jump to Support and Community')
 | [Contributing](#contributing 'Jump to Contributing')
@@ -179,10 +179,10 @@ Use the rich commit search to find exactly what you're looking for. Its powerful
 
 GitKraken Workspaces allow you to easily group and manage multiple repositories together, accessible from anywhere, streamlining your workflow. Create workspaces just for yourself or share (coming soon in GitLens) them with your team for faster onboarding and better collaboration.
 
-The Focus view brings all of your GitHub pull requests and issues into a unified actionable view to help to you more easily juggle work in progress, pending work, reviews, and more. Quickly see if anything requires your attention while keeping you focused.
+Focus brings all of your GitHub pull requests and issues into a unified actionable view to help to you more easily juggle work in progress, pending work, reviews, and more. Quickly see if anything requires your attention while keeping you focused.
 
 <figure align="center">
-  <img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/focus-view.png" alt="Focus View" />
+  <img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/focus-view.png" alt="Focus view" />
 </figure>
 
 ## Visual File History ✨
@@ -227,7 +227,7 @@ A guided, step-by-step experience for quickly and safely executing Git commands.
 
 Use a series of new commands to:
 
-- Expore the commit history of branches and files
+- Explore the commit history of branches and files
 - Quickly search for and navigate to (and action upon) commits
 - Explore a file of a commit
 - View and explore your stashes
@@ -257,11 +257,11 @@ Use the Explain panel on the **Commit Details** view to leverage AI to help you
 
 Use the `Generate Commit Message` command from the Source Control view's context menu to automatically generate a commit message for your staged changes by leveraging AI.
 
-# Ready for GitLens Pro?
+# Ready for GitKraken Pro?
 
-When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitLens Pro. With GitLens Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan.
+When you're ready to unlock the full potential of GitLens and enjoy all the benefits on your privately hosted repos, consider upgrading to GitKraken Pro. With GitKraken Pro, you'll gain access to ✨ features on privately hosted repos and ☁️ features based on the Pro plan.
 
-To learn more about the pricing and the additional ✨ and ☁️ features offered with GitLens Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitLens Pro today and take your Git workflow to the next level!
+To learn more about the pricing and the additional ✨ and ☁️ features offered with GitKraken Pro, visit the [GitLens Pricing page](https://www.gitkraken.com/gitlens/pricing). Upgrade to GitKraken Pro today and take your Git workflow to the next level!
 
 # FAQ
 
@@ -272,9 +272,9 @@ Yes. All features are free to use on all repos, **except** for features,
 - marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos
 - marked with a ☁️ require a GitKraken Account, with access level based on your [plan](https://www.gitkraken.com/gitlens/pricing), e.g. Free, Pro, etc
 
-While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos &mdash; use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires an account and access is based on your plan, e.g. Free, Pro, etc.
+While GitLens offers a remarkable set of free features, a subset of features tailored for professional developers and teams, marked with a ✨, require a trial or paid plan for use on privately hosted repos &mdash; use on local or publicly hosted repos is free for everyone. Additionally some features marked with a ☁️, rely on GitKraken Dev Services which requires a GitKraken account and access is based on your plan, e.g. Free, Pro, etc.
 
-Preview ✨ features instantly for free for 3 days without an account, or start a free Pro trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens.
+Preview ✨ features instantly for free for 3 days without an account, or start a free GitKraken trial to get an additional 7 days and gain access to ☁️ features to experience the full power of GitLens.
 
 ## Are ✨ and ☁️ features free to use?
 
@@ -300,7 +300,7 @@ Join the GitLens community on [GitHub Discussions](https://github.com/gitkraken/
 
 For any issues or inquiries related to GitLens, you can reach out to the GitKraken support team via the [official support page](https://support.gitkraken.com/). They will be happy to assist you with any problems you may encounter.
 
-With GitLens Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitLens Pro plan.
+With GitKraken Pro, you gain access to priority email support from our customer success team, ensuring higher priority and faster response times. Custom onboarding and training are also available to help you and your team quickly get up and running with a GitKraken Pro plan.
 
 # Contributing
 
@@ -345,6 +345,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - Cory Forsyth ([@bantic](https://github.com/bantic)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=bantic)
 - John Gee ([@shadowspawn](https://github.com/shadowspawn)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=shadowspawn)
 - Geoffrey ([@g3offrey](https://github.com/g3offrey)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=g3offrey)
+- Omar Ghazi ([@omarfesal](https://github.com/omarfesal)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=omarfesal)
 - Neil Ghosh ([@neilghosh](https://github.com/neilghosh)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=neilghosh)
 - Guillaume Rozan ([@grozan](https://github.com/grozan)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=grozan)
 - Guillem González Vela ([@guillemglez](https://github.com/guillemglez)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=guillemglez)
@@ -360,6 +361,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - jogo- ([@jogo-](https://github.com/jogo-)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jogo-)
 - Nils K ([@septatrix](https://github.com/septatrix)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=septatrix)
 - Chris Kaczor ([@ckaczor](https://github.com/ckaczor)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=ckaczor)
+- Aidos Kanapyanov ([@aidoskanapyanov](https://github.com/aidoskanapyanov)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=aidoskanapyanov)
 - Allan Karlson ([@bees4ever](https://github.com/bees4ever)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=bees4ever)
 - Nafiur Rahman Khadem ([@ShafinKhadem](https://github.com/ShafinKhadem)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=ShafinKhadem)
 - Mathew King ([@MathewKing](https://github.com/MathewKing)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=MathewKing)
@@ -385,6 +387,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - Connor Peet ([@connor4312](https://github.com/connor4312)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=connor4312)
 - Maxim Pekurin ([@pmaxim25](https://github.com/pmaxim25)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=pmaxim25)
 - Leo Dan Peña ([@leo9-py](https://github.com/leo9-py)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=leo9-py)
+- Aman Prakash ([@gitgoap](https://github.com/gitgoap)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gitgoap)
 - Arunprasad Rajkumar ([@arajkumar](https://github.com/arajkumar)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=arajkumar)
 - David Rees ([@studgeek](https://github.com/studgeek)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=studgeek)
 - Rickard ([@rickardp](https://github.com/rickardp)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=rickardp)