Skip to content

Commit

Permalink
Merge branch 'main' into eslint-fix-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg committed Jan 21, 2025
2 parents bd51f89 + 537e1d7 commit 5cacb93
Show file tree
Hide file tree
Showing 8 changed files with 257 additions and 283 deletions.
13 changes: 12 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@
"contributions": [
"ideas",
"tool",
"doc"
"doc",
"code"
]
},
{
Expand All @@ -221,6 +222,16 @@
"profile": "/~https://github.com/michaelfaith",
"contributions": [
"infra",
"code",
"maintenance"
]
},
{
"login": "chouchouji",
"name": "chouchouji",
"avatar_url": "/~https://avatars.githubusercontent.com/u/70570907?v=4",
"profile": "/~https://github.com/chouchouji",
"contributions": [
"code"
]
}
Expand Down
14 changes: 13 additions & 1 deletion .release-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,19 @@
"plugins": {
"@release-it/conventional-changelog": {
"infile": "CHANGELOG.md",
"preset": "angular"
"preset": "angular",
"types": [
{ "section": "Features", "type": "feat" },
{ "section": "Bug Fixes", "type": "fix" },
{ "section": "Performance Improvements", "type": "perf" },
{ "hidden": true, "type": "build" },
{ "hidden": true, "type": "chore" },
{ "hidden": true, "type": "ci" },
{ "hidden": true, "type": "docs" },
{ "hidden": true, "type": "refactor" },
{ "hidden": true, "type": "style" },
{ "hidden": true, "type": "test" }
]
}
}
}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [0.20.1](/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/compare/v0.20.0...v0.20.1) (2025-01-19)

### Bug Fixes

- bump package-json-validator dep to 0.8 ([#735](/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/issues/735)) ([29a9722](/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commit/29a9722c15d39984ea99c2be346e20c2f4f9c76e)), closes [#734](/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/issues/734)

# [0.20.0](/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/compare/v0.19.0...v0.20.0) (2025-01-17)

### Features
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<a href="#contributors" target="_blank">
<!-- prettier-ignore-start -->
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<img alt="All Contributors: 22 👪" src="https://img.shields.io/badge/all_contributors-22_👪-21bb42.svg" />
<img alt="All Contributors: 23 👪" src="https://img.shields.io/badge/all_contributors-23_👪-21bb42.svg" />
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<!-- prettier-ignore-end -->
</a>
Expand Down Expand Up @@ -173,15 +173,16 @@ Thanks! 💖
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/nschonni"><img src="/~https://avatars.githubusercontent.com/u/1297909?v=4?s=100" width="100px;" alt="Nick Schonning"/><br /><sub><b>Nick Schonning</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=nschonni" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/rakleed"><img src="/~https://avatars.githubusercontent.com/u/19418601?v=4?s=100" width="100px;" alt="Pavel"/><br /><sub><b>Pavel</b></sub></a><br /><a href="#ideas-rakleed" title="Ideas, Planning, & Feedback">🤔</a> <a href="#tool-rakleed" title="Tools">🔧</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=rakleed" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/rakleed"><img src="/~https://avatars.githubusercontent.com/u/19418601?v=4?s=100" width="100px;" alt="Pavel"/><br /><sub><b>Pavel</b></sub></a><br /><a href="#ideas-rakleed" title="Ideas, Planning, & Feedback">🤔</a> <a href="#tool-rakleed" title="Tools">🔧</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=rakleed" title="Documentation">📖</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=rakleed" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://sasial.dev"><img src="/~https://avatars.githubusercontent.com/u/44125644?v=4?s=100" width="100px;" alt="Sasial"/><br /><sub><b>Sasial</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=sasial-dev" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/sirugh"><img src="/~https://avatars.githubusercontent.com/u/1278869?v=4?s=100" width="100px;" alt="Stephen"/><br /><sub><b>Stephen</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=sirugh" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://hyoban.cc"><img src="/~https://avatars.githubusercontent.com/u/38493346?v=4?s=100" width="100px;" alt="Stephen Zhou"/><br /><sub><b>Stephen Zhou</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/issues?q=author%3Ahyoban" title="Bug reports">🐛</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=hyoban" title="Code">💻</a> <a href="#ideas-hyoban" title="Ideas, Planning, & Feedback">🤔</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=hyoban" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://ota-meshi.github.io/"><img src="/~https://avatars.githubusercontent.com/u/16508807?v=4?s=100" width="100px;" alt="Yosuke Ota"/><br /><sub><b>Yosuke Ota</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/issues?q=author%3Aota-meshi" title="Bug reports">🐛</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=ota-meshi" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/b3rnhard"><img src="/~https://avatars.githubusercontent.com/u/10774404?v=4?s=100" width="100px;" alt="b3rnhard"/><br /><sub><b>b3rnhard</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/issues?q=author%3Ab3rnhard" title="Bug reports">🐛</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/michaelfaith"><img src="/~https://avatars.githubusercontent.com/u/8071845?v=4?s=100" width="100px;" alt="michael faith"/><br /><sub><b>michael faith</b></sub></a><br /><a href="#infra-michaelfaith" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=michaelfaith" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/chouchouji"><img src="/~https://avatars.githubusercontent.com/u/70570907?v=4?s=100" width="100px;" alt="chouchouji"/><br /><sub><b>chouchouji</b></sub></a><br /><a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=chouchouji" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="/~https://github.com/michaelfaith"><img src="/~https://avatars.githubusercontent.com/u/8071845?v=4?s=100" width="100px;" alt="michael faith"/><br /><sub><b>michael faith</b></sub></a><br /><a href="#infra-michaelfaith" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json/commits?author=michaelfaith" title="Code">💻</a> <a href="#maintenance-michaelfaith" title="Maintenance">🚧</a></td>
</tr>
</tbody>
</table>
Expand Down
1 change: 1 addition & 0 deletions docs/rules/sort-collections.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Defaults:
"devDependencies",
"dependencies",
"peerDependencies",
"overrides",
"config",
"exports"
]
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-package-json",
"version": "0.20.0",
"version": "0.20.1",
"description": "Rules for consistent, readable, and valid package.json files. 🗂️",
"homepage": "/~https://github.com/JoshuaKGoldberg/eslint-plugin-package-json#readme",
"bugs": {
Expand Down Expand Up @@ -76,7 +76,7 @@
"@types/semver": "^7.5.6",
"@types/sort-object-keys": "^1.1.3",
"@types/validate-npm-package-name": "^4.0.2",
"@vitest/coverage-v8": "^1.2.1",
"@vitest/coverage-v8": "^3.0.0",
"@vitest/eslint-plugin": "^1.1.25",
"console-fail-test": "^0.5.0",
"cspell": "^8.3.2",
Expand Down Expand Up @@ -104,7 +104,7 @@
"tsup": "^8.0.1",
"typescript": "^5.7.3",
"typescript-eslint": "^8.20.0",
"vitest": "^1.2.1"
"vitest": "^3.0.0"
},
"peerDependencies": {
"eslint": ">=8.0.0",
Expand Down
Loading

0 comments on commit 5cacb93

Please sign in to comment.