diff options
| author | isaacs <i@izs.me> | 2021-03-25 07:20:19 +0300 |
|---|---|---|
| committer | Ruy Adorno <ruyadorno@hotmail.com> | 2021-03-26 00:31:58 +0300 |
| commit | 59cf37962a2286e0f7d3bd37fa9c8bc3bac94218 (patch) | |
| tree | b155773999e00c92cb8a17a0d80d947ae820c52a | |
| parent | 95ba87622e00d68270eda9e071b19737718fca16 (diff) | |
Always set npm.command to canonical command nameisaacs/set-npm-command-to-canonical-command
This ensures that we get a npm_command env set to, eg 'run-script'
instead of the shorthand 'run'.
PR-URL: https://github.com/npm/cli/pull/2958
Credit: @isaacs
Close: #2958
Reviewed-by: @wraithgar
| -rw-r--r-- | lib/npm.js | 2 | ||||
| -rw-r--r-- | test/lib/npm.js | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/npm.js b/lib/npm.js index 42541a90f..5f8b2ff3d 100644 --- a/lib/npm.js +++ b/lib/npm.js @@ -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) diff --git a/test/lib/npm.js b/test/lib/npm.js index 573919398..4d40792af 100644 --- a/test/lib/npm.js +++ b/test/lib/npm.js @@ -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] } @@ -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, [ |