Skip to content

Commit d0655a9

Browse files
chore: release 4.0.0 (#98)
🤖 I have created a release *beep* *boop* --- ## [4.0.0](v3.0.1...v4.0.0) (2024-09-24) ### ⚠️ BREAKING CHANGES * `parse-conflict-json` now supports node `^18.17.0 || >=20.5.0` ### Bug Fixes * [`2ff0df4`](2ff0df4) [#97](#97) align to npm 10 node engine range (@hashtagchris) ### Dependencies * [`5d1036d`](5d1036d) [#97](#97) `[email protected]` ### Chores * [`bbad0b5`](bbad0b5) [#97](#97) run template-oss-apply (@hashtagchris) * [`aaa60b6`](aaa60b6) [#96](#96) enable auto publish (#96) (@reggi) * [`ceb69ec`](ceb69ec) [#93](#93) bump @npmcli/eslint-config from 4.0.5 to 5.0.0 (@dependabot[bot]) * [`5724d51`](5724d51) [#80](#80) bump @npmcli/template-oss to 4.22.0 (@lukekarrys) * [`46686e2`](46686e2) [#94](#94) postinstall for dependabot template-oss PR (@hashtagchris) * [`0694002`](0694002) [#94](#94) bump @npmcli/template-oss from 4.23.1 to 4.23.3 (@dependabot[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 5d1036d commit d0655a9

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-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-
".": "3.0.1"
2+
".": "4.0.0"
33
}

CHANGELOG.md

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

3+
## [4.0.0](https://github.com/npm/parse-conflict-json/compare/v3.0.1...v4.0.0) (2024-09-24)
4+
### ⚠️ BREAKING CHANGES
5+
* `parse-conflict-json` now supports node `^18.17.0 || >=20.5.0`
6+
### Bug Fixes
7+
* [`2ff0df4`](https://github.com/npm/parse-conflict-json/commit/2ff0df4d37cb149ccd21481c8b26fd1b9aa316c7) [#97](https://github.com/npm/parse-conflict-json/pull/97) align to npm 10 node engine range (@hashtagchris)
8+
### Dependencies
9+
* [`5d1036d`](https://github.com/npm/parse-conflict-json/commit/5d1036dd519c3e8986ebaf9992e8ac4beb4224e1) [#97](https://github.com/npm/parse-conflict-json/pull/97) `[email protected]`
10+
### Chores
11+
* [`bbad0b5`](https://github.com/npm/parse-conflict-json/commit/bbad0b53516ca113241a1dbb1e5e60e35ba34919) [#97](https://github.com/npm/parse-conflict-json/pull/97) run template-oss-apply (@hashtagchris)
12+
* [`aaa60b6`](https://github.com/npm/parse-conflict-json/commit/aaa60b66feb4eec118dfb01bce5fb4fb08a28ae7) [#96](https://github.com/npm/parse-conflict-json/pull/96) enable auto publish (#96) (@reggi)
13+
* [`ceb69ec`](https://github.com/npm/parse-conflict-json/commit/ceb69ecb12523db7b01ea32dfd000d811b12791d) [#93](https://github.com/npm/parse-conflict-json/pull/93) bump @npmcli/eslint-config from 4.0.5 to 5.0.0 (@dependabot[bot])
14+
* [`5724d51`](https://github.com/npm/parse-conflict-json/commit/5724d51bf2ae67842d89e027b0d5c48ae1afa23b) [#80](https://github.com/npm/parse-conflict-json/pull/80) bump @npmcli/template-oss to 4.22.0 (@lukekarrys)
15+
* [`46686e2`](https://github.com/npm/parse-conflict-json/commit/46686e2baf57cd0afb4ee76ded4fad8637448d8d) [#94](https://github.com/npm/parse-conflict-json/pull/94) postinstall for dependabot template-oss PR (@hashtagchris)
16+
* [`0694002`](https://github.com/npm/parse-conflict-json/commit/069400257a1b2e80d1a333ef9e6b9ba07f053f67) [#94](https://github.com/npm/parse-conflict-json/pull/94) bump @npmcli/template-oss from 4.23.1 to 4.23.3 (@dependabot[bot])
17+
318
## [3.0.1](https://github.com/npm/parse-conflict-json/compare/v3.0.0...v3.0.1) (2023-03-16)
419

520
### Dependencies

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": "3.0.1",
3+
"version": "4.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)