Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More
Socket
Sign inDemoInstall
Socket

parse-conflict-json

Package Overview
Dependencies
Maintainers
6
Versions
10
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

parse-conflict-json - npm Package Compare versions

Comparing version 2.0.2 to 3.0.0

20

package.json
{
"name": "parse-conflict-json",
"version": "2.0.2",
"version": "3.0.0",
"description": "Parse a JSON string that has git merge conflicts, resolving if possible",

@@ -11,9 +11,5 @@ "author": "GitHub Inc.",

"snap": "tap",
"preversion": "npm test",
"postversion": "npm publish",
"postpublish": "git push origin --follow-tags",
"lint": "eslint \"**/*.js\"",
"postlint": "template-oss-check",
"lintfix": "npm run lint -- --fix",
"prepublishOnly": "git push origin --follow-tags",
"posttest": "npm run lint",

@@ -23,11 +19,15 @@ "template-oss-apply": "template-oss-apply --force"

"tap": {
"check-coverage": true
"check-coverage": true,
"nyc-arg": [
"--exclude",
"tap-snapshots/**"
]
},
"devDependencies": {
"@npmcli/eslint-config": "^3.0.1",
"@npmcli/template-oss": "3.2.0",
"@npmcli/template-oss": "4.5.1",
"tap": "^16.0.1"
},
"dependencies": {
"json-parse-even-better-errors": "^2.3.1",
"json-parse-even-better-errors": "^3.0.0",
"just-diff": "^5.0.1",

@@ -45,8 +45,8 @@ "just-diff-apply": "^5.2.0"

"engines": {
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "3.2.0"
"version": "4.5.1"
}
}
SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

Packages

npm

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc