From 127c975e77e0b51c9252cc18fec2ef02c6c3e866 Mon Sep 17 00:00:00 2001 From: Philip Oliver Date: Fri, 15 Dec 2017 03:59:19 +0100 Subject: [PATCH] changed parse-json requires to json5 (#272) --- packages/core/parcel-bundler/src/FSCache.js | 4 ++-- packages/core/parcel-bundler/test/hmr.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/parcel-bundler/src/FSCache.js b/packages/core/parcel-bundler/src/FSCache.js index 71db7f3d8d9..63b0b6b7bda 100644 --- a/packages/core/parcel-bundler/src/FSCache.js +++ b/packages/core/parcel-bundler/src/FSCache.js @@ -3,7 +3,7 @@ const path = require('path'); const md5 = require('./utils/md5'); const objectHash = require('./utils/objectHash'); const pkg = require('../package.json'); -const parseJson = require('parse-json'); +const json5 = require('json5'); // These keys can affect the output, so if they differ, the cache should not match const OPTION_KEYS = ['publicURL', 'minify', 'hmr']; @@ -56,7 +56,7 @@ class FSCache { } let data = await fs.readFile(cacheFile); - return parseJson(data); + return json5.parse(data); } catch (err) { return null; } diff --git a/packages/core/parcel-bundler/test/hmr.js b/packages/core/parcel-bundler/test/hmr.js index 251f9cb344c..ba54a1806be 100644 --- a/packages/core/parcel-bundler/test/hmr.js +++ b/packages/core/parcel-bundler/test/hmr.js @@ -6,7 +6,7 @@ const rimraf = require('rimraf'); const promisify = require('../src/utils/promisify'); const ncp = promisify(require('ncp')); const WebSocket = require('ws'); -const parseJson = require('parse-json'); +const json5 = require('json5'); describe('hmr', function() { let b, ws; @@ -45,7 +45,7 @@ describe('hmr', function() { 'exports.a = 5; exports.b = 5;' ); - let msg = parseJson(await nextEvent(ws, 'message')); + let msg = json5.parse(await nextEvent(ws, 'message')); assert.equal(msg.type, 'update'); assert.equal(msg.assets.length, 1); assert.equal(msg.assets[0].generated.js, 'exports.a = 5; exports.b = 5;'); @@ -65,7 +65,7 @@ describe('hmr', function() { 'require("fs"); exports.a = 5; exports.b = 5;' ); - let msg = parseJson(await nextEvent(ws, 'message')); + let msg = json5.parse(await nextEvent(ws, 'message')); assert.equal(msg.type, 'update'); assert.equal(msg.assets.length, 2); });