Browse Source

deps: hotfix to bump npx version

This includes a critical fix to get npx working on Windows

PR-URL: https://github.com/nodejs/node/pull/14235
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
v6
Kat Marchán 8 years ago
committed by James M Snell
parent
commit
cb8cefdbcb
  1. 10
      deps/npm/node_modules/libnpx/CHANGELOG.md
  2. 18
      deps/npm/node_modules/libnpx/index.js
  3. 2
      deps/npm/node_modules/libnpx/libnpx.1
  4. 22
      deps/npm/node_modules/libnpx/package.json
  5. 2
      deps/npm/package.json

10
deps/npm/node_modules/libnpx/CHANGELOG.md

@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
<a name="9.2.1"></a>
## [9.2.1](https://github.com/zkat/npx/compare/v9.2.0...v9.2.1) (2017-07-14)
### Bug Fixes
* **windows:** fixed windows binary pathing issues ([761dfe9](https://github.com/zkat/npx/commit/761dfe9))
<a name="9.2.0"></a> <a name="9.2.0"></a>
# [9.2.0](https://github.com/zkat/npx/compare/v9.1.0...v9.2.0) (2017-07-14) # [9.2.0](https://github.com/zkat/npx/compare/v9.1.0...v9.2.0) (2017-07-14)

18
deps/npm/node_modules/libnpx/index.js

@ -126,9 +126,13 @@ function localBinPath (cwd) {
module.exports._getEnv = getEnv module.exports._getEnv = getEnv
function getEnv (opts) { function getEnv (opts) {
const args = ['run', 'env', '--parseable'] const args = ['run', 'env', '--parseable']
return which(opts.npm).catch(() => { return findNodeScript(opts.npm, {isLocal: true}).then(npmPath => {
if (npmPath) {
args.unshift(opts.npm) args.unshift(opts.npm)
return process.argv[0] return process.argv[0]
} else {
return opts.npm
}
}).then(npmPath => { }).then(npmPath => {
return child.exec(npmPath, args) return child.exec(npmPath, args)
}).then(require('dotenv').parse) }).then(require('dotenv').parse)
@ -188,9 +192,13 @@ function getNpmCache (opts) {
if (opts.userconfig) { if (opts.userconfig) {
args.push('--userconfig', child.escapeArg(opts.userconfig, true)) args.push('--userconfig', child.escapeArg(opts.userconfig, true))
} }
return which(opts.npm).catch(() => { return findNodeScript(opts.npm, {isLocal: true}).then(npmPath => {
if (npmPath) {
args.unshift(opts.npm) args.unshift(opts.npm)
return process.argv[0] return process.argv[0]
} else {
return opts.npm
}
}).then(npmPath => { }).then(npmPath => {
return child.exec(npmPath, args) return child.exec(npmPath, args)
}).then(cache => cache.trim()) }).then(cache => cache.trim())
@ -210,9 +218,13 @@ function buildArgs (specs, prefix, opts) {
module.exports._installPackages = installPackages module.exports._installPackages = installPackages
function installPackages (specs, prefix, opts) { function installPackages (specs, prefix, opts) {
const args = buildArgs(specs, prefix, opts) const args = buildArgs(specs, prefix, opts)
return which(opts.npm).catch(() => { return findNodeScript(opts.npm, {isLocal: true}).then(npmPath => {
if (npmPath) {
args.unshift(opts.npm) args.unshift(opts.npm)
return process.argv[0] return process.argv[0]
} else {
return opts.npm
}
}).then(npmPath => { }).then(npmPath => {
return child.escapeArg(npmPath, true) return child.escapeArg(npmPath, true)
}).then(npmPath => { }).then(npmPath => {

2
deps/npm/node_modules/libnpx/libnpx.1

@ -1,4 +1,4 @@
.TH "NPX" "1" "July 2017" "libnpx@9.1.0" "User Commands" .TH "NPX" "1" "July 2017" "libnpx@9.2.0" "User Commands"
.SH "NAME" .SH "NAME"
\fBnpx\fR \- execute npm package binaries \fBnpx\fR \- execute npm package binaries
.SH SYNOPSIS .SH SYNOPSIS

22
deps/npm/node_modules/libnpx/package.json

@ -1,8 +1,8 @@
{ {
"_from": "libnpx@9.2.0", "_from": "libnpx@9.2.1",
"_id": "libnpx@9.2.0", "_id": "libnpx@9.2.1",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha512-cXZxnp/Fmqip914pC+0a5S8UnqmG//bNIL+MtTt3pvpHkSa7Jhti9da+Wo3tjdzIc/V1A2zN4cO5wcnOzIWeig==", "_integrity": "sha512-8xbZZ4+jn48kyyqgeIKKRxTie3wz/8HDP8eo7yA/bpPPmXtdSbudSc2BStSR6qCYt9Y5Jzf/h/gyxDsMmcCFGQ==",
"_location": "/libnpx", "_location": "/libnpx",
"_phantomChildren": { "_phantomChildren": {
"graceful-fs": "4.1.11", "graceful-fs": "4.1.11",
@ -14,21 +14,21 @@
"_requested": { "_requested": {
"type": "version", "type": "version",
"registry": true, "registry": true,
"raw": "libnpx@9.2.0", "raw": "libnpx@9.2.1",
"name": "libnpx", "name": "libnpx",
"escapedName": "libnpx", "escapedName": "libnpx",
"rawSpec": "9.2.0", "rawSpec": "9.2.1",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "9.2.0" "fetchSpec": "9.2.1"
}, },
"_requiredBy": [ "_requiredBy": [
"#USER", "#USER",
"/" "/"
], ],
"_resolved": "https://registry.npmjs.org/libnpx/-/libnpx-9.2.0.tgz", "_resolved": "https://registry.npmjs.org/libnpx/-/libnpx-9.2.1.tgz",
"_shasum": "ce721ffc7bdfa275c18677b82728e6ee96a50642", "_shasum": "cef11bfa2e5ac68521a7c1b82f48ee8ba19884ae",
"_spec": "libnpx@9.2.0", "_spec": "libnpx@9.2.1",
"_where": "/Users/zkat/Documents/code/npm", "_where": "/Users/zkat/Documents/code/release-checkouts/node/deps/npm",
"author": { "author": {
"name": "Kat Marchán", "name": "Kat Marchán",
"email": "kzm@sykosomatic.org" "email": "kzm@sykosomatic.org"
@ -109,5 +109,5 @@
"update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
"update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
}, },
"version": "9.2.0" "version": "9.2.1"
} }

2
deps/npm/package.json

@ -64,7 +64,7 @@
"ini": "~1.3.4", "ini": "~1.3.4",
"init-package-json": "~1.10.1", "init-package-json": "~1.10.1",
"lazy-property": "~1.0.0", "lazy-property": "~1.0.0",
"libnpx": "~9.2.0", "libnpx": "~9.2.1",
"lockfile": "~1.0.3", "lockfile": "~1.0.3",
"lodash._baseuniq": "~4.6.0", "lodash._baseuniq": "~4.6.0",
"lodash.clonedeep": "~4.5.0", "lodash.clonedeep": "~4.5.0",

Loading…
Cancel
Save