Skip to content

Commit dcada29

Browse files
committed
Merge remote-tracking branch 'origin'
2 parents b5c0483 + 81c0a12 commit dcada29

File tree

417 files changed

+29802
-15538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+29802
-15538
lines changed

.eslintrc.base.json

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"extends": [
66
"eslint:recommended",
77
"plugin:@typescript-eslint/strict-type-checked",
8-
"plugin:@typescript-eslint/stylistic-type-checked",
98
"plugin:import/recommended",
109
"plugin:import/typescript",
1110
"prettier"
@@ -24,33 +23,25 @@
2423
"root": true,
2524
"rules": {
2625
"anti-trojan-source/no-bidi": "error",
27-
"arrow-parens": ["off"],
28-
"brace-style": ["off", "stroustrup"],
29-
"consistent-return": "off",
30-
"curly": ["error", "multi-line", "consistent"],
31-
"eol-last": "error",
32-
"linebreak-style": ["error", "unix"],
33-
"new-parens": "error",
34-
"no-console": "off",
3526
"no-constant-condition": ["warn", { "checkLoops": false }],
3627
"no-constant-binary-expression": "error",
3728
"no-caller": "error",
3829
"no-debugger": "off",
39-
"no-dupe-class-members": "off",
4030
"no-else-return": "warn",
4131
"no-empty": ["warn", { "allowEmptyCatch": true }],
4232
"no-eval": "error",
4333
"no-ex-assign": "warn",
4434
"no-extend-native": "error",
4535
"no-extra-bind": "error",
36+
"no-extra-semi": "off",
4637
"no-floating-decimal": "error",
4738
"no-implicit-coercion": "error",
4839
"no-implied-eval": "error",
4940
"no-inner-declarations": "off",
5041
"no-lone-blocks": "error",
5142
"no-lonely-if": "error",
5243
"no-loop-func": "error",
53-
"no-multi-spaces": "error",
44+
"no-mixed-spaces-and-tabs": "off",
5445
"no-restricted-globals": ["error", "process"],
5546
"no-restricted-imports": [
5647
"error",
@@ -98,8 +89,13 @@
9889
"message": "Use @env/ instead"
9990
},
10091
{
101-
"group": ["src/**/*"],
92+
"group": ["src/*"],
10293
"message": "Use relative paths instead"
94+
},
95+
{
96+
"group": ["react-dom"],
97+
"importNames": ["Container"],
98+
"message": "Use our Container instead"
10399
}
104100
]
105101
}
@@ -138,10 +134,7 @@
138134
"prefer-rest-params": "error",
139135
"prefer-spread": "error",
140136
"prefer-template": "error",
141-
"quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
142137
"require-atomic-updates": "off",
143-
"semi": ["error", "always"],
144-
"semi-style": ["error", "last"],
145138
"sort-imports": [
146139
"error",
147140
{
@@ -153,7 +146,7 @@
153146
],
154147
"yoda": "error",
155148
"import/consistent-type-specifier-style": ["error", "prefer-top-level"],
156-
"import/extensions": ["error", "never"],
149+
"import/extensions": "off",
157150
"import/newline-after-import": "warn",
158151
"import/no-absolute-path": "error",
159152
"import/no-cycle": "off",
@@ -326,7 +319,22 @@
326319
{
327320
"files": ["src/env/node/**/*"],
328321
"rules": {
329-
"no-restricted-imports": "off"
322+
"no-restricted-imports": [
323+
"error",
324+
{
325+
"patterns": [
326+
{
327+
"group": ["src/*"],
328+
"message": "Use relative paths instead"
329+
},
330+
{
331+
"group": ["react-dom"],
332+
"importNames": ["Container"],
333+
"message": "Use our Container instead"
334+
}
335+
]
336+
}
337+
]
330338
}
331339
}
332340
]

.fantasticonrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ts-check
22

3-
/** @type { import('fantasticon').RunnerOptions} } */
3+
/** @type { import('@twbs/fantasticon').RunnerOptions} } */
44
const config = {
55
name: 'glicons',
66
prefix: 'glicon',

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ d790e9db047769de079f6838c3578f3a47bf5930
88
9c2df377d3e1842ed09eea5bb99be00edee9ca9c
99
444bf829156b3170c8b4b5156dcf10b06db83779
1010
4dba4612670c0a942e3daa3e6a34a57aebe257ae
11+
fbccf2428fd671378202de43ff99deff66168a13

.prettierrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
{
1515
"files": "*.md",
1616
"options": { "tabWidth": 2 }
17-
},
18-
{
19-
"files": "*.svg",
20-
"options": { "parser": "html" }
2117
}
2218
]
2319
}

.vscode/settings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"editor.codeActionsOnSave": {
3-
"source.fixAll.eslint": true
3+
"source.fixAll.eslint": "explicit"
44
},
5-
"eslint.packageManager": "yarn",
65
"files.associations": {
76
".eslintrc*.json": "jsonc"
87
},

CHANGELOG.md

Lines changed: 145 additions & 7 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ If this is your first contribution to GitLens, please give yourself credit by ad
170170
171171
## Publishing
172172

173-
### Versioning
173+
### Stable Releases
174+
175+
#### Versioning
174176

175177
GitLens version changes are bucketed into two types:
176178

@@ -179,40 +181,39 @@ GitLens version changes are bucketed into two types:
179181

180182
<small>Note: `major` version bumps are only considered for more special circumstances.</small>
181183

182-
#### Updating the CHANGELOG
183-
184-
All recent changes are listed under `## [Unreleased]`. This title and corresponding link at the bottom of the page will need to be updated.
185-
186-
The title should be updated to the upcoming version and the release date (YYYY-MM-DD):
184+
#### Preparing
187185

188-
```markdown
189-
<!-- from: -->
186+
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.
190187

191-
## [Unreleased]
188+
1. Ensure you are on a clean working tree
189+
2. Run `yarn run prep-release` and enter the desired version when prompted.
190+
3. Review the `Bumps to v<major.minor.patch>` commit
191+
4. Run `git push --follow-tags` to push the commit and tag
192192

193-
<!-- to: -->
194-
195-
## [12.1.0] - 2022-06-14
196-
```
193+
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).
197194

198-
Stage this file so it will be included with the version commit.
195+
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.
199196

200-
#### Version Commit
197+
### Pre-releases
201198

202-
Run `yarn version` and enter the upcoming version when prompted.
199+
The [Publish Pre-release workflow](.github/workflows/cd-pre.yml) is automatically run every AM unless no new changes have been committed to `main`.
203200

204-
Once the commit is completed, run `git push --follow-tags` to push the version commit and the newly generated tags.
201+
### Insiders (deprecated use pre-release instead)
205202

206-
### GitHub Actions and Deployment
203+
The Publish Insiders workflow is no longer available and was replaced with the pre-release edition.
207204

208-
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).
205+
## Updating GL Icons
209206

210-
If the action fails, the VSIX will need to be built locally with `yarn package` and uploaded manually in the marketplace.
207+
To add new icons to the GL Icons font follow the steps below:
211208

212-
### Pre-release edition
209+
- Add new SVG icons to the `images/icons` folder
210+
- Update the `images/icons/template/mapping.json` file with entries for the new icons (append to the end of the file)
211+
- Optimize and build the icons by running the following from a terminal:
213212

214-
The [Publish Pre-release workflow](.github/workflows/cd-pre.yml) is automatically run every AM unless no new changes have been committed to `main`.
213+
```
214+
yarn run icons:svgo
215+
yarn run build:icons
215216
216-
### Insiders edition (deprecated use pre-release instead)
217+
```
217218

218-
The Publish Insiders workflow is no longer available and was replaced with the pre-release edition.
219+
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.

README.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Use `Switch to Pre-Release Version` on the extension banner to live on the edge
2323
All features are free to use on all repos, **except** for features,
2424

2525
- marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos
26-
- 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
26+
- 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
2727

2828
See the [FAQ](#is-gitlens-free-to-use 'Jump to FAQ') for more details.
2929

3030
[Features](#discover-powerful-features 'Jump to Discover Powerful Features')
3131
| [Labs](#gitkraken-labs 'Jump to GitKraken Labs')
32-
| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitLens Pro?')
32+
| [Pro](#ready-for-gitlens-pro 'Jump to Ready for GitKraken Pro?')
3333
| [FAQ](#faq 'Jump to FAQ')
3434
| [Support and Community](#support-and-community 'Jump to Support and Community')
3535
| [Contributing](#contributing 'Jump to Contributing')
@@ -179,10 +179,10 @@ Use the rich commit search to find exactly what you're looking for. Its powerful
179179

180180
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.
181181

182-
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.
182+
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.
183183

184184
<figure align="center">
185-
<img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/focus-view.png" alt="Focus View" />
185+
<img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/focus-view.png" alt="Focus view" />
186186
</figure>
187187

188188
## Visual File History ✨
@@ -227,7 +227,7 @@ A guided, step-by-step experience for quickly and safely executing Git commands.
227227

228228
Use a series of new commands to:
229229

230-
- Expore the commit history of branches and files
230+
- Explore the commit history of branches and files
231231
- Quickly search for and navigate to (and action upon) commits
232232
- Explore a file of a commit
233233
- View and explore your stashes
@@ -257,11 +257,11 @@ Use the Explain panel on the **Commit Details** view to leverage AI to help you
257257

258258
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.
259259

260-
# Ready for GitLens Pro?
260+
# Ready for GitKraken Pro?
261261

262-
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.
262+
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.
263263

264-
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!
264+
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!
265265

266266
# FAQ
267267

@@ -272,9 +272,9 @@ Yes. All features are free to use on all repos, **except** for features,
272272
- marked with a ✨ require a [trial or paid plan](https://www.gitkraken.com/gitlens/pricing) for use on privately hosted repos
273273
- 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
274274

275-
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.
275+
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.
276276

277-
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.
277+
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.
278278

279279
## Are ✨ and ☁️ features free to use?
280280

@@ -300,7 +300,7 @@ Join the GitLens community on [GitHub Discussions](https://github.com/gitkraken/
300300

301301
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.
302302

303-
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.
303+
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.
304304

305305
# Contributing
306306

@@ -345,6 +345,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
345345
- Cory Forsyth ([@bantic](https://github.com/bantic)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=bantic)
346346
- John Gee ([@shadowspawn](https://github.com/shadowspawn)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=shadowspawn)
347347
- Geoffrey ([@g3offrey](https://github.com/g3offrey)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=g3offrey)
348+
- Omar Ghazi ([@omarfesal](https://github.com/omarfesal)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=omarfesal)
348349
- Neil Ghosh ([@neilghosh](https://github.com/neilghosh)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=neilghosh)
349350
- Guillaume Rozan ([@grozan](https://github.com/grozan)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=grozan)
350351
- 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 🙏❤️:
360361
- jogo- ([@jogo-](https://github.com/jogo-)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=jogo-)
361362
- Nils K ([@septatrix](https://github.com/septatrix)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=septatrix)
362363
- Chris Kaczor ([@ckaczor](https://github.com/ckaczor)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=ckaczor)
364+
- Aidos Kanapyanov ([@aidoskanapyanov](https://github.com/aidoskanapyanov)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=aidoskanapyanov)
363365
- Allan Karlson ([@bees4ever](https://github.com/bees4ever)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=bees4ever)
364366
- Nafiur Rahman Khadem ([@ShafinKhadem](https://github.com/ShafinKhadem)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=ShafinKhadem)
365367
- 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 🙏❤️:
385387
- Connor Peet ([@connor4312](https://github.com/connor4312)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=connor4312)
386388
- Maxim Pekurin ([@pmaxim25](https://github.com/pmaxim25)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=pmaxim25)
387389
- Leo Dan Peña ([@leo9-py](https://github.com/leo9-py)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=leo9-py)
390+
- Aman Prakash ([@gitgoap](https://github.com/gitgoap)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=gitgoap)
388391
- Arunprasad Rajkumar ([@arajkumar](https://github.com/arajkumar)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=arajkumar)
389392
- David Rees ([@studgeek](https://github.com/studgeek)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=studgeek)
390393
- Rickard ([@rickardp](https://github.com/rickardp)) &mdash; [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=rickardp)

0 commit comments

Comments
 (0)