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 3.0.1 to 4.0.0

22

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

@@ -11,7 +11,8 @@ "author": "GitHub Inc.",

"snap": "tap",
"lint": "eslint \"**/*.js\"",
"lint": "npm run eslint",
"postlint": "template-oss-check",
"lintfix": "npm run lint -- --fix",
"lintfix": "npm run eslint -- --fix",
"posttest": "npm run lint",
"template-oss-apply": "template-oss-apply --force"
"template-oss-apply": "template-oss-apply --force",
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
},

@@ -26,8 +27,8 @@ "tap": {

"devDependencies": {
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.12.0",
"@npmcli/eslint-config": "^5.0.0",
"@npmcli/template-oss": "4.23.3",
"tap": "^16.0.1"
},
"dependencies": {
"json-parse-even-better-errors": "^3.0.0",
"json-parse-even-better-errors": "^4.0.0",
"just-diff": "^6.0.0",

@@ -38,3 +39,3 @@ "just-diff-apply": "^5.2.0"

"type": "git",
"url": "https://github.com/npm/parse-conflict-json.git"
"url": "git+https://github.com/npm/parse-conflict-json.git"
},

@@ -46,8 +47,9 @@ "files": [

"engines": {
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
"node": "^18.17.0 || >=20.5.0"
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.12.0"
"version": "4.23.3",
"publish": true
}
}
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