From b1be58a294abda455ab9ff90ce637dcfdba47357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= Date: Thu, 28 Nov 2019 09:14:19 +0000 Subject: [PATCH 1/2] rename `packageJSON` to `packageFile` --- lib/dependency-graph.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/dependency-graph.js b/lib/dependency-graph.js index 45997395..0c6fe12c 100644 --- a/lib/dependency-graph.js +++ b/lib/dependency-graph.js @@ -16,21 +16,21 @@ exports.checkEntriesWhitelist = filename => { } } -const packageJSON = readPkgUp.sync() +const packageFile = readPkgUp.sync() function recordPackageEntry(entry) { - exports.entries.add(path.resolve(packageJSON.path, '..', entry)) + exports.entries.add(path.resolve(packageFile.path, '..', entry)) } -if (packageJSON) { - for (const key in packageJSON.package) { +if (packageFile) { + for (const key in packageFile.package) { if (key === 'main') { - recordPackageEntry(packageJSON.package.main) + recordPackageEntry(packageFile.package.main) } else if (key === 'entries') { - packageJSON.package.entries.forEach(recordPackageEntry) + packageFile.package.entries.forEach(recordPackageEntry) } else if (/-bundles$/.test(key)) { // github-asset-pipeline internal manifest format - Object.keys(packageJSON.package[key]).forEach(recordPackageEntry) + Object.keys(packageFile.package[key]).forEach(recordPackageEntry) } } } From eb07e1cc3c42877d5a16bfb33ada68a827c35cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= Date: Thu, 28 Nov 2019 09:15:00 +0000 Subject: [PATCH 2/2] use correct `packageJson` key for package.json contents --- lib/dependency-graph.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dependency-graph.js b/lib/dependency-graph.js index 0c6fe12c..d92a38ef 100644 --- a/lib/dependency-graph.js +++ b/lib/dependency-graph.js @@ -23,14 +23,14 @@ function recordPackageEntry(entry) { } if (packageFile) { - for (const key in packageFile.package) { + for (const key in packageFile.packageJson) { if (key === 'main') { - recordPackageEntry(packageFile.package.main) + recordPackageEntry(packageFile.packageJson.main) } else if (key === 'entries') { - packageFile.package.entries.forEach(recordPackageEntry) + packageFile.packageJson.entries.forEach(recordPackageEntry) } else if (/-bundles$/.test(key)) { // github-asset-pipeline internal manifest format - Object.keys(packageFile.package[key]).forEach(recordPackageEntry) + Object.keys(packageFile.packageJson[key]).forEach(recordPackageEntry) } } }