Skip to content

Commit

Permalink
BREAKING CHANGE: Drop annotating peer deps, these are no longer insta…
Browse files Browse the repository at this point in the history
…lled after npm > 3
  • Loading branch information
lili2311 committed Oct 1, 2018
1 parent 33755e6 commit 53ca05b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
10 changes: 2 additions & 8 deletions lib/dep-types.js
Expand Up @@ -15,20 +15,15 @@ var depTypes = module.exports = function (depName, pkg) {
from = pkg.optionalDependencies[depName];
}

if (pkg.peerDependencies && pkg.peerDependencies[depName]) {
type = depTypes.PEER;
from = pkg.peerDependencies[depName];
}
var bundled = !!(pkg.bundleDependencies &&
pkg.bundleDependencies.indexOf(depName) !== -1);

// production deps trump all
if (pkg.dependencies && pkg.dependencies[depName]) {
type = depTypes.PROD;
from = pkg.dependencies[depName];
}

var bundled = !!(pkg.bundleDependencies &&
pkg.bundleDependencies.indexOf(depName) !== -1);

return {
type: type,
from: from,
Expand All @@ -38,6 +33,5 @@ var depTypes = module.exports = function (depName, pkg) {

module.exports.EXTRANEOUS = 'extraneous';
module.exports.OPTIONAL = 'optional';
module.exports.PEER = 'peer';
module.exports.PROD = 'prod';
module.exports.DEV = 'dev';
2 changes: 0 additions & 2 deletions lib/deps.js
Expand Up @@ -89,7 +89,6 @@ function loadModulesInternal(root, rootDepType, parent, options) {
__from: (parent || { __from: [] }).__from,
__devDependencies: pkg.devDependencies,
__dependencies: pkg.dependencies,
__peerDependencies: pkg.peerDependencies,
__optionalDependencies: pkg.optionalDependencies,
__bundleDependencies: pkg.bundleDependencies,
__filename: pkg.__filename,
Expand Down Expand Up @@ -185,7 +184,6 @@ function loadModulesInternal(root, rootDepType, parent, options) {
__from: pkg.__from.concat(full),
__devDependencies: curr.devDependencies,
__dependencies: curr.dependencies,
__peerDependencies: curr.peerDependencies,
__optionalDependencies: curr.optionalDependencies,
__bundleDependencies: curr.bundleDependencies,
__filename: curr.__filename,
Expand Down
5 changes: 2 additions & 3 deletions lib/logical.js
Expand Up @@ -126,7 +126,6 @@ function walkDeps(root, tree, from) {
tree.__from && from.length === 1 ? tree.__devDependencies : {});

deps = _.extend(deps, tree.__optionalDependencies);
deps = _.extend(deps, tree.__peerDependencies);

return Object.keys(deps).reduce(function walkDepsPicker(acc, curr) {
// only attempt to walk this dep if it's not in our path already
Expand All @@ -146,13 +145,13 @@ function walkDeps(root, tree, from) {
var info = depTypes(dep.name, {
dependencies: tree.__dependencies,
devDependencies: tree.__devDependencies,
optionalDependencies: tree.__optionalDependencies,
bundleDependencies: tree.__bundleDependencies,
peerDependencies: tree.__peerDependencies,
optionalDependencies: tree.__optionalDependencies,
});

pkg.depType = info.type;
pkg.dep = info.from;

if (tree.bundled) { // carry the bundled flag down from the parent
dep.bundled = pkg.bundled = tree.bundled;
}
Expand Down

0 comments on commit 53ca05b

Please sign in to comment.