Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BREAKING CHANGE: Drop peer deps #40

Merged
merged 1 commit into from Oct 2, 2018
Merged

BREAKING CHANGE: Drop peer deps #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions lib/dep-types.js
View file
Open in desktop
Expand Up @@ -15,11 +15,6 @@ var depTypes = module.exports = function (depName, pkg) {
from = pkg.optionalDependencies[depName];
}

if (pkg.peerDependencies && pkg.peerDependencies[depName]) {
type = depTypes.PEER;
from = pkg.peerDependencies[depName];
}

// production deps trump all
if (pkg.dependencies && pkg.dependencies[depName]) {
type = depTypes.PROD;
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
View file
Open in desktop
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
View file
Open in desktop
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