fix: $npm_execpath always points to npm, even when running npx

tap-snapshots/test/lib/docs.js.test.cjs

@@ -2354,7 +2354,6 @@ Object {
  "nodeBin": "{NODE}",
  "nodeVersion": "2.2.2",
  "noProxy": "",
- "npmBin": "{CWD}/{TESTDIR}/docs.js",
  "npmCommand": "version",
  "npmVersion": "3.3.3",
  "npxCache": "{CWD}/cache/_npx",

workspaces/config/lib/definitions/index.js

@@ -18,13 +18,6 @@ const flatten = (obj, flat = {}) => {
  flat[key] = val
  }
  }
-
- // XXX make this the bin/npm-cli.js file explicitly instead
- // otherwise using npm programmatically is a bit of a pain.
- flat.npmBin = require.main ? require.main.filename
- : /* istanbul ignore next - not configurable property */ undefined
- flat.nodeBin = process.env.NODE || process.execPath
-
  return flat
 }
 

workspaces/config/lib/index.js

@@ -115,6 +115,7 @@ class Config {
  this.defaults = defaults
 
  this.npmPath = npmPath
+ this.npmBin = join(this.npmPath, 'bin/npm-cli.js')
  this.argv = argv
  this.env = env
  this.execPath = execPath
@@ -231,6 +232,8 @@ class Config {
  for (const { data } of this.data.values()) {
  this.#flatten(data, this.#flatOptions)
  }
+ this.#flatOptions.nodeBin = process.env.NODE || this.execPath
+ this.#flatOptions.npmBin = this.npmBin
  process.emit('timeEnd', 'config:load:flatten')
 
  return this.#flatOptions

workspaces/config/lib/set-envs.js

@@ -101,10 +101,7 @@ const setEnvs = (config) => {
  if (cliConf['node-options']) {
  env.NODE_OPTIONS = cliConf['node-options']
  }
-
- if (require.main && require.main.filename) {
- env.npm_execpath = require.main.filename
- }
+ env.npm_execpath = config.npmBin
  env.NODE = env.npm_node_execpath = config.execPath
 }