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

parse-conflict-json

Package Overview
Dependencies
Maintainers
1
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 1.1.0 to 1.1.1

2

index.js

@@ -1,2 +0,2 @@

const parseJSON = require('json-parse-better-errors')
const parseJSON = require('json-parse-even-better-errors')
const { diff } = require('just-diff')

@@ -3,0 +3,0 @@ const { diffApply } = require('just-diff-apply')

{
"name": "parse-conflict-json",
"version": "1.1.0",
"version": "1.1.1",
"description": "Parse a JSON string that has git merge conflicts, resolving if possible",

@@ -21,5 +21,5 @@ "author": "Isaac Z. Schlueter <i@izs.me> (https://izs.me)",

"dependencies": {
"json-parse-better-errors": "^1.0.2",
"just-diff": "^3.0.1",
"just-diff-apply": "^3.0.0"
"just-diff-apply": "^3.0.0",
"json-parse-even-better-errors": "^2.3.0"
},

@@ -26,0 +26,0 @@ "repository": {

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