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

fix: exec legacyPeerDeps #1739

Closed
wants to merge 1 commit into from
Closed

fix: exec legacyPeerDeps #1739

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const exec = async args => {
throw 'canceled'
}
}
await arb.reify({ add })
await arb.reify({ ...npm.flatOptions, add })
}
pathArr.unshift(resolve(installDir, 'node_modules/.bin'))
}
Expand Down
42 changes: 36 additions & 6 deletions test/lib/exec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const npm = {
flatOptions: {
yes: true,
call: '',
package: []
package: [],
legacyPeerDeps: false
},
localPrefix: 'local-prefix',
config: {
Expand Down Expand Up @@ -87,6 +88,7 @@ t.afterEach(cb => {
READ.length = 0
READ_RESULT = ''
READ_ERROR = null
npm.flatOptions.legacyPeerDeps = false
npm.flatOptions.package = []
npm.flatOptions.call = ''
cb()
Expand Down Expand Up @@ -151,7 +153,7 @@ t.test('npm exec foo, not present locally or in central loc', async t => {
})
t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
t.match(ARB_CTOR, [ { package: ['foo'], path } ])
t.strictSame(ARB_REIFY, [{add: ['foo@']}], 'need to install foo@')
t.match(ARB_REIFY, [{add: ['foo@'], legacyPeerDeps: false}], 'need to install foo@')
t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
t.match(RUN_SCRIPTS, [{
Expand Down Expand Up @@ -190,7 +192,7 @@ t.test('npm exec foo, not present locally but in central loc', async t => {
})
t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
t.match(ARB_CTOR, [ { package: ['foo'], path } ])
t.strictSame(ARB_REIFY, [], 'no need to install again, already there')
t.match(ARB_REIFY, [], 'no need to install again, already there')
t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
t.match(RUN_SCRIPTS, [{
Expand Down Expand Up @@ -229,7 +231,7 @@ t.test('npm exec foo, present locally but wrong version', async t => {
})
t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
t.match(ARB_CTOR, [ { package: ['foo'], path } ])
t.strictSame(ARB_REIFY, [{ add: ['foo@2.x'] }], 'need to add foo@2.x')
t.match(ARB_REIFY, [{ add: ['foo@2.x'], legacyPeerDeps: false }], 'need to add foo@2.x')
t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
t.match(RUN_SCRIPTS, [{
Expand Down Expand Up @@ -360,7 +362,7 @@ t.test('run command with 2 packages, need install, verify sort', t => {
})
t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
t.match(ARB_CTOR, [ { package: packages, path } ])
t.strictSame(ARB_REIFY, [{add}], 'need to install both packages')
t.match(ARB_REIFY, [{add, legacyPeerDeps: false}], 'need to install both packages')
t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
t.match(RUN_SCRIPTS, [{
Expand Down Expand Up @@ -502,7 +504,7 @@ t.test('prompt when installs are needed if not already present', async t => {
})
t.strictSame(MKDIRPS, [installDir], 'need to make install dir')
t.match(ARB_CTOR, [ { package: packages, path } ])
t.strictSame(ARB_REIFY, [{add}], 'need to install both packages')
t.match(ARB_REIFY, [{add, legacyPeerDeps: false}], 'need to install both packages')
t.equal(PROGRESS_ENABLED, true, 'progress re-enabled')
const PATH = `${resolve(installDir, 'node_modules', '.bin')}${delimiter}${process.env.PATH}`
t.match(RUN_SCRIPTS, [{
Expand Down Expand Up @@ -656,3 +658,31 @@ t.test('abort if -n provided', async t => {
t.strictSame(RUN_SCRIPTS, [])
t.strictSame(READ, [])
})

t.test('forward legacyPeerDeps opt', async t => {
const path = t.testdir()
const installDir = resolve('cache-dir/_npx/f7fbba6e0636f890')
npm.localPrefix = path
ARB_ACTUAL_TREE[path] = {
children: new Map()
}
ARB_ACTUAL_TREE[installDir] = {
children: new Map()
}
MANIFESTS.foo = {
name: 'foo',
version: '1.2.3',
bin: {
foo: 'foo'
},
_from: 'foo@'
}
npm.flatOptions.yes = true
npm.flatOptions.legacyPeerDeps = true
await exec(['foo'], er => {
if (er) {
throw er
}
})
t.match(ARB_REIFY, [{add: ['foo@'], legacyPeerDeps: true}], 'need to install foo@ using legacyPeerDeps opt')
})