diff --git a/node_modules/read-package-json/CHANGELOG.md b/node_modules/read-package-json/CHANGELOG.md
index 25e9896cece35..b21f94d72792b 100644
--- a/node_modules/read-package-json/CHANGELOG.md
+++ b/node_modules/read-package-json/CHANGELOG.md
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+# [2.1.0](https://github.com/npm/read-package-json/compare/v2.0.13...v2.1.0) (2019-08-13)
+
+
+### Features
+
+* support bundleDependencies: true ([76f6f42](https://github.com/npm/read-package-json/commit/76f6f42))
+
+
+
## [2.0.13](https://github.com/npm/read-package-json/compare/v2.0.12...v2.0.13) (2018-03-08)
diff --git a/node_modules/read-package-json/package.json b/node_modules/read-package-json/package.json
index d4b3405c7a6af..5c597498814bd 100644
--- a/node_modules/read-package-json/package.json
+++ b/node_modules/read-package-json/package.json
@@ -1,36 +1,33 @@
{
- "_args": [
- [
- "read-package-json@2.0.13",
- "/Users/rebecca/code/npm"
- ]
- ],
- "_from": "read-package-json@2.0.13",
- "_id": "read-package-json@2.0.13",
+ "_from": "read-package-json@2.1.0",
+ "_id": "read-package-json@2.1.0",
"_inBundle": false,
- "_integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==",
+ "_integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
"_location": "/read-package-json",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
- "raw": "read-package-json@2.0.13",
+ "raw": "read-package-json@2.1.0",
"name": "read-package-json",
"escapedName": "read-package-json",
- "rawSpec": "2.0.13",
+ "rawSpec": "2.1.0",
"saveSpec": null,
- "fetchSpec": "2.0.13"
+ "fetchSpec": "2.1.0"
},
"_requiredBy": [
+ "#USER",
"/",
"/init-package-json",
"/libcipm",
+ "/libnpm",
"/read-installed",
"/read-package-tree"
],
- "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz",
- "_spec": "2.0.13",
- "_where": "/Users/rebecca/code/npm",
+ "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
+ "_shasum": "e3d42e6c35ea5ae820d9a03ab0c7291217fc51d5",
+ "_spec": "read-package-json@2.1.0",
+ "_where": "/Users/isaacs/dev/npm/cli",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",
@@ -39,6 +36,7 @@
"bugs": {
"url": "https://github.com/npm/read-package-json/issues"
},
+ "bundleDependencies": false,
"dependencies": {
"glob": "^7.1.1",
"graceful-fs": "^4.1.2",
@@ -46,6 +44,7 @@
"normalize-package-data": "^2.0.0",
"slash": "^1.0.0"
},
+ "deprecated": false,
"description": "The thing npm uses to read package.json files with semantics and defaults and validation",
"devDependencies": {
"standard": "^11.0.0",
@@ -73,5 +72,5 @@
"release": "standard-version -s",
"test": "tap --nyc-arg=--all --coverage test/*.js"
},
- "version": "2.0.13"
+ "version": "2.1.0"
}
diff --git a/node_modules/read-package-json/read-json.js b/node_modules/read-package-json/read-json.js
index 243af8e271d3f..9f8f81bd1cada 100644
--- a/node_modules/read-package-json/read-json.js
+++ b/node_modules/read-package-json/read-json.js
@@ -17,6 +17,7 @@ module.exports = readJson
// put more stuff on here to customize.
readJson.extraSet = [
+ bundleDependencies,
gypfile,
serverjs,
scriptpath,
@@ -324,6 +325,23 @@ function bins_ (file, data, bins, cb) {
return cb(null, data)
}
+function bundleDependencies (file, data, cb) {
+ var bd = 'bundleDependencies'
+ var bdd = 'bundledDependencies'
+ // normalize key name
+ if (data[bdd] !== undefined) {
+ if (data[bd] === undefined) data[bd] = data[bdd]
+ delete data[bdd]
+ }
+ if (data[bd] === false) delete data[bd]
+ else if (data[bd] === true) {
+ data[bd] = Object.keys(data.dependencies || {})
+ } else if (data[bd] !== undefined && !Array.isArray(data[bd])) {
+ delete data[bd]
+ }
+ return cb(null, data)
+}
+
function githead (file, data, cb) {
if (data.gitHead) return cb(null, data)
var dir = path.dirname(file)
@@ -385,17 +403,16 @@ function checkBinReferences_ (file, data, warn, cb) {
keys.forEach(function (key) {
var dirName = path.dirname(file)
var relName = data.bin[key]
- try {
- var binPath = path.resolve(dirName, relName)
- fs.stat(binPath, (err) => handleExists(relName, !err))
- } catch (error) {
- if (error.message === 'Arguments to path.resolve must be strings' || error.message.indexOf('Path must be a string') === 0) {
- warn('Bin filename for ' + key + ' is not a string: ' + util.inspect(relName))
- handleExists(relName, true)
- } else {
- cb(error)
- }
+ if (typeof relName !== 'string') {
+ var msg = 'Bin filename for ' + key +
+ ' is not a string: ' + util.inspect(relName)
+ warn(msg)
+ delete data.bin[key]
+ handleExists(relName, true)
+ return
}
+ var binPath = path.resolve(dirName, relName)
+ fs.stat(binPath, (err) => handleExists(relName, !err))
})
}
diff --git a/package-lock.json b/package-lock.json
index 3f5229a87f617..bd95d426ae3ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4835,9 +4835,9 @@
}
},
"read-package-json": {
- "version": "2.0.13",
- "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz",
- "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
+ "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
"requires": {
"glob": "^7.1.1",
"graceful-fs": "^4.1.2",
diff --git a/package.json b/package.json
index 0d4673a5a0377..fcb9e191b0434 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
"read": "~1.0.7",
"read-cmd-shim": "~1.0.1",
"read-installed": "~4.0.3",
- "read-package-json": "^2.0.13",
+ "read-package-json": "^2.1.0",
"read-package-tree": "^5.3.1",
"readable-stream": "^3.4.0",
"readdir-scoped-modules": "^1.1.0",