Skip to content

Always set npm.command to canonical command name #2958

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

Merged
ruyadorno merged 1 commit into from
Mar 25, 2021
Merged

Always set npm.command to canonical command name #2958

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/npm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const proxyCmds = new Proxy({}, {
// old way of doing things, until we can make breaking changes to the
// npm.commands[x] api
target[actual] = new Proxy(
(args, cb) => npm[_runCmd](cmd, impl, args, cb),
(args, cb) => npm[_runCmd](actual, impl, args, cb),
{
get: (target, attr, receiver) => {
return Reflect.get(impl, attr, receiver)
Expand Down
9 changes: 7 additions & 2 deletions test/lib/npm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ for (const env of Object.keys(process.env).filter(e => /^npm_/.test(e))) {
'should match "npm test" or "npm run test"'
)
} else
t.match(process.env[env], /^(run)|(run-script)|(exec)$/)
t.match(process.env[env], /^(run-script|exec)$/)
}
delete process.env[env]
}
Expand Down Expand Up @@ -411,10 +411,15 @@ t.test('npm.load', t => {
npm.localPrefix = dir

await new Promise((res, rej) => {
npm.commands['run-script']([], er => {
// verify that calling the command with a short name still sets
// the npm.command property to the full canonical name of the cmd.
npm.command = null
npm.commands.run([], er => {
if (er)
rej(er)

t.equal(npm.command, 'run-script', 'npm.command set to canonical name')

t.match(
consoleLogs,
[
Expand Down