Skip to content
This repository has been archived by the owner on Aug 11, 2022. It is now read-only.

Commit

Permalink
deps: Consider devDependencies when deciding whether to hoist a package
Browse files Browse the repository at this point in the history
Fixes: #10727
Fixes: #11062
Fixes: #12654
Fixes: #10277
Fixes: #11766
Fixes: #11043
PR-URL: #12811
Credit: @schmod
Reviewed-By: @iarna
  • Loading branch information
Andrew Schmadel authored and zkat committed Dec 1, 2016
1 parent fc61c08 commit d8471a2
Show file tree
Hide file tree
Showing 3 changed files with 121 additions and 0 deletions.
8 changes: 8 additions & 0 deletions lib/install/deps.js
Expand Up @@ -639,6 +639,14 @@ var earliestInstallable = exports.earliestInstallable = function (requiredBy, tr
return null
}

var devDeps = tree.package.devDependencies || {}
if (tree.isTop && devDeps[pkg.name]) {
var requested = npa(pkg.name + '@' + devDeps[pkg.name])
if (!doesChildVersionMatch({package: pkg}, requested, tree)) {
return null
}
}

if (tree.phantomChildren && tree.phantomChildren[pkg.name]) return null

if (tree.isTop) return tree
Expand Down
1 change: 1 addition & 0 deletions test/tap/shrinkwrap-shared-dev-dependency.js
Expand Up @@ -21,6 +21,7 @@ test("shrinkwrap doesn't strip out the shared dependency", function (t) {

npm.install('.', function (err) {
if (err) return t.fail(err)
npm.config.set('dev', true) // npm install unsets this

npm.commands.shrinkwrap([], true, function (err, results) {
if (err) return t.fail(err)
Expand Down
112 changes: 112 additions & 0 deletions test/tap/unit-deps-earliestInstallable.js
@@ -0,0 +1,112 @@
'use strict'
var test = require('tap').test
var requireInject = require('require-inject')

// we're just mocking to avoid having to call `npm.load`
var deps = requireInject('../../lib/install/deps.js', {
'../../lib/npm.js': {
config: {
get: function (val) { return (val === 'global-style' || val === 'legacy-bundling') ? false : 'mock' }
}
}
})

var earliestInstallable = deps.earliestInstallable

test('earliestInstallable should consider devDependencies', function (t) {
var dep1 = {
children: [],
package: {
name: 'dep1',
dependencies: { dep2: '2.0.0' }
}
}

// a library required by the base package
var dep2 = {
package: {
name: 'dep2',
version: '1.0.0'
}
}

// an incompatible verson of dep2. required by dep1
var dep2a = {
package: {
name: 'dep2',
version: '2.0.0',
_from: {
raw: 'dep2@1.0.0',
scope: null,
escapedName: 'dep2',
name: 'dep2',
rawSpec: '1.0.0',
spec: '1.0.0',
type: 'version'
}
},
parent: dep1
}

var pkg = {
isTop: true,
children: [dep1],
package: {
name: 'pkg',
dependencies: { dep1: '1.0.0' },
devDependencies: { dep2: '1.0.0' }
}
}

dep1.parent = pkg
dep2a.parent = dep1
dep2.parent = pkg

var earliest = earliestInstallable(dep1, dep1, dep2a.package)
t.isDeeply(earliest, dep1, 'should hoist package when an incompatible devDependency is present')
t.end()
})

test('earliestInstallable should reuse shared prod/dev deps when they are identical', function (t) {
var dep1 = {
children: [],
package: {
name: 'dep1',
dependencies: { dep2: '1.0.0' }
}
}

var dep2 = {
package: {
name: 'dep2',
version: '1.0.0',
_from: {
raw: 'dep2@^1.0.0',
scope: null,
escapedName: 'dep2',
name: 'dep2',
rawSpec: '^1.0.0',
spec: '>=1.0.0 <2.0.0',
type: 'range'
}
}
}

var pkg = {
isTop: true,
children: [dep1],
package: {
name: 'pkg',
dependencies: { dep1: '1.0.0' },
devDependencies: { dep2: '^1.0.0' }
}
}

dep1.parent = pkg
dep2.parent = pkg

var earliest = earliestInstallable(dep1, dep1, dep2.package)
t.isDeeply(earliest, pkg, 'should reuse identical shared dev/prod deps when installing both')
t.end()
})

0 comments on commit d8471a2

Please sign in to comment.