Skip to content

Commit 3cae62c

Browse files
chore: release 5.0.0 (#110)
🤖 I have created a release *beep* *boop* --- ## [5.0.0](v4.0.0...v5.0.0) (2025-10-22) ### ⚠️ BREAKING CHANGES * `parse-conflict-json` now supports node `^20.17.0 || >=22.9.0` ### Bug Fixes * [`4ed3e82`](4ed3e82) [#108](#108) align to npm 11 node engine range (@owlstronaut) ### Chores * [`f8d6bc1`](f8d6bc1) [#108](#108) template-oss-apply (@owlstronaut) * [`1584356`](1584356) [#101](#101) postinstall workflow updates (#101) (@owlstronaut) * [`b261dd4`](b261dd4) [#107](#107) bump @npmcli/template-oss from 4.26.0 to 4.27.1 (#107) (@dependabot[bot], @npm-cli-bot) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent f8d6bc1 commit 3cae62c

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "4.0.0"
2+
".": "5.0.0"
33
}

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## [5.0.0](https://github.com/npm/parse-conflict-json/compare/v4.0.0...v5.0.0) (2025-10-22)
4+
### ⚠️ BREAKING CHANGES
5+
* `parse-conflict-json` now supports node `^20.17.0 || >=22.9.0`
6+
### Bug Fixes
7+
* [`4ed3e82`](https://github.com/npm/parse-conflict-json/commit/4ed3e828b26ce68e630fa8b96550cf2e3e3dc87d) [#108](https://github.com/npm/parse-conflict-json/pull/108) align to npm 11 node engine range (@owlstronaut)
8+
### Chores
9+
* [`f8d6bc1`](https://github.com/npm/parse-conflict-json/commit/f8d6bc15809c804509bb91f24d4ff035abe2c5a0) [#108](https://github.com/npm/parse-conflict-json/pull/108) template-oss-apply (@owlstronaut)
10+
* [`1584356`](https://github.com/npm/parse-conflict-json/commit/1584356e9d083bc2a58b5d0fd113c0b9097b106f) [#101](https://github.com/npm/parse-conflict-json/pull/101) postinstall workflow updates (#101) (@owlstronaut)
11+
* [`b261dd4`](https://github.com/npm/parse-conflict-json/commit/b261dd4d9fd059266ce7c9481c0557e22636287a) [#107](https://github.com/npm/parse-conflict-json/pull/107) bump @npmcli/template-oss from 4.26.0 to 4.27.1 (#107) (@dependabot[bot], @npm-cli-bot)
12+
313
## [4.0.0](https://github.com/npm/parse-conflict-json/compare/v3.0.1...v4.0.0) (2024-09-24)
414
### ⚠️ BREAKING CHANGES
515
* `parse-conflict-json` now supports node `^18.17.0 || >=20.5.0`

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parse-conflict-json",
3-
"version": "4.0.0",
3+
"version": "5.0.0",
44
"description": "Parse a JSON string that has git merge conflicts, resolving if possible",
55
"author": "GitHub Inc.",
66
"license": "ISC",

0 commit comments

Comments
 (0)