diff options
| author | isaacs <i@izs.me> | 2020-08-21 01:45:16 +0300 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2020-08-21 01:45:16 +0300 |
| commit | a5a6a516d16828c1375eaf41d04468d919df4a57 (patch) | |
| tree | dbe187bdd4b94a167a14b13476812b15ddcf769c /node_modules/parse-conflict-json | |
| parent | a4295f5db7667e8cc6b83abdad168619ad31a12f (diff) | |
json-parse-even-better-errors@2.3.0
Adds support for indentation/newline formatting preservation
Diffstat (limited to 'node_modules/parse-conflict-json')
| -rw-r--r-- | node_modules/parse-conflict-json/index.js | 2 | ||||
| -rw-r--r-- | node_modules/parse-conflict-json/package.json | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/parse-conflict-json/index.js b/node_modules/parse-conflict-json/index.js index 4089fe6bf..8b5dbde40 100644 --- a/node_modules/parse-conflict-json/index.js +++ b/node_modules/parse-conflict-json/index.js @@ -1,4 +1,4 @@ -const parseJSON = require('json-parse-better-errors') +const parseJSON = require('json-parse-even-better-errors') const { diff } = require('just-diff') const { diffApply } = require('just-diff-apply') diff --git a/node_modules/parse-conflict-json/package.json b/node_modules/parse-conflict-json/package.json index 007d6b6e3..3962e22f3 100644 --- a/node_modules/parse-conflict-json/package.json +++ b/node_modules/parse-conflict-json/package.json @@ -1,6 +1,6 @@ { "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", "author": "Isaac Z. Schlueter <i@izs.me> (https://izs.me)", "license": "ISC", @@ -18,9 +18,9 @@ "tap": "^14.6.1" }, "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" }, "repository": { "type": "git", |