Skip to content

Commit 6cd85e9

Browse files
authored
Merge pull request #478 from mzgoddard/parse-json
refactor: use `parse-json`
2 parents 5ff8c75 + 1fbd31d commit 6cd85e9

File tree

6 files changed

+5
-17
lines changed

6 files changed

+5
-17
lines changed

lib/CacheEnhancedResolve.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const path = require('path');
22

33
const lodash = require('lodash');
44
const nodeObjectHash = require('node-object-hash');
5+
const parseJson = require('parse-json');
56

67
const pluginCompat = require('./util/plugin-compat');
78
const promisify = require('./util/promisify');
@@ -10,7 +11,6 @@ const serial = require('./util/serial');
1011
const values = require('./util/Object.values');
1112
const bulkFsTask = require('./util/bulk-fs-task');
1213
const { parityCacheFromCache, pushParityWriteOps } = require('./util/parity');
13-
const parseJson = require('./util/parseJson');
1414

1515
const serialNormalResolved = serial.created({
1616
result: serial.path,

lib/CacheModuleResolver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const nodeObjectHash = require('node-object-hash');
2+
const parseJson = require('parse-json');
23

34
const serial = require('./util/serial');
45
const pluginCompat = require('./util/plugin-compat');
56
const relateContext = require('./util/relate-context');
6-
const parseJson = require('./util/parseJson');
77
const { parityCacheFromCache, pushParityWriteOps } = require('./util/parity');
88

99
const serialJsonKey = {

lib/SerializerAppend2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
const fs = require('graceful-fs');
22
const { join, resolve } = require('path');
33
const _mkdirp = require('mkdirp');
4+
const parseJson = require('parse-json');
45
const _rimraf = require('rimraf');
56

67
const promisify = require('./util/promisify');
7-
const parseJson = require('./util/parseJson');
88

99
const close = promisify(fs.close);
1010
const mkdirp = promisify(_mkdirp);

lib/util/parity.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
const parseJson = require('parse-json');
12
const { cachePrefix } = require('.');
2-
const parseJson = require('./parseJson');
33

44
class ParityRoot {
55
constructor() {

lib/util/parseJson.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@
6969
"chalk": "^2.4.1",
7070
"find-cache-dir": "^2.0.0",
7171
"graceful-fs": "^4.1.11",
72-
"jsonlint": "^1.6.3",
7372
"lodash": "^4.15.0",
7473
"mkdirp": "^0.5.1",
7574
"node-object-hash": "^1.2.0",
75+
"parse-json": "^4.0.0",
7676
"pkg-dir": "^3.0.0",
7777
"rimraf": "^2.6.2",
7878
"semver": "^5.6.0",

0 commit comments

Comments
 (0)