Skip to content
This repository was archived by the owner on Aug 17, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const CipmOpts = figgyPudding({
log: {},
loglevel: {},
only: {},
optional: { default: true },
prefix: {},
prod: 'production',
production: {},
Expand Down Expand Up @@ -263,7 +264,10 @@ class Installer {
/^dev(elopment)?$/.test(this.opts.also)
)
const includeProd = !/^dev(elopment)?$/.test(this.opts.only)
return (dep.dev && includeDev) || (!dep.dev && includeProd)
const includeOptional = includeProd && this.opts.optional
return (dep.dev && includeDev) ||
(dep.optional && includeOptional) ||
(!dep.dev && !dep.optional && includeProd)
}

updateJson (tree) {
Expand Down
37 changes: 37 additions & 0 deletions test/specs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,43 @@ test('removes failed optional dependencies', t => {
})
})

test('don\'t install optional dependencies with no-optional argument', t => {
const fixture = new Tacks(Dir({
'package.json': File({
name: pkgName,
version: pkgVersion,
dependencies: { a: '^1' },
optionalDependencies: { b: '^1' }
}),
'package-lock.json': File({
lockfileVersion: 1,
dependencies: {
a: { version: '1.0.0' },
b: { version: '1.0.0', optional: true }
}
})
}))
fixture.create(prefix)

extract = (name, child, childPath, opts) => {
const files = new Tacks(Dir({
'package.json': File({
name,
version: '1.0.0'
})
}))
files.create(childPath)
}

return run({ optional: false }).then(details => {
t.equal(details.pkgCount, 1, 'only prod deps counted')
t.ok(fs.statSync(path.join(prefix, 'node_modules', 'a')), 'dep a is there')
t.throws(() => {
fs.statSync(path.join(prefix, 'node_modules', 'b'))
}, 'optional dep b is not there')
})
})

test('runs lifecycle hooks of packages with env variables', t => {
const originalConsoleLog = console.log
console.log = () => {}
Expand Down