From cb8cefdbcb18eea872e93c1ed89fe3ae3f1b35ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Fri, 14 Jul 2017 17:39:10 -0700 Subject: [PATCH] deps: hotfix to bump npx version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This includes a critical fix to get npx working on Windows PR-URL: https://github.com/nodejs/node/pull/14235 Reviewed-By: Jeremiah Senkpiel Reviewed-By: Refael Ackermann Reviewed-By: Anna Henningsen Reviewed-By: Yuta Hiroto Reviewed-By: Gibson Fahnestock Reviewed-By: Tobias Nießen Reviewed-By: James M Snell --- deps/npm/node_modules/libnpx/CHANGELOG.md | 10 ++++++++ deps/npm/node_modules/libnpx/index.js | 30 ++++++++++++++++------- deps/npm/node_modules/libnpx/libnpx.1 | 2 +- deps/npm/node_modules/libnpx/package.json | 22 ++++++++--------- deps/npm/package.json | 2 +- 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/deps/npm/node_modules/libnpx/CHANGELOG.md b/deps/npm/node_modules/libnpx/CHANGELOG.md index c53646d020..19a89f7c47 100644 --- a/deps/npm/node_modules/libnpx/CHANGELOG.md +++ b/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. + +## [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)) + + + # [9.2.0](https://github.com/zkat/npx/compare/v9.1.0...v9.2.0) (2017-07-14) diff --git a/deps/npm/node_modules/libnpx/index.js b/deps/npm/node_modules/libnpx/index.js index 7c0bd6df85..d42172e500 100644 --- a/deps/npm/node_modules/libnpx/index.js +++ b/deps/npm/node_modules/libnpx/index.js @@ -126,9 +126,13 @@ function localBinPath (cwd) { module.exports._getEnv = getEnv function getEnv (opts) { const args = ['run', 'env', '--parseable'] - return which(opts.npm).catch(() => { - args.unshift(opts.npm) - return process.argv[0] + return findNodeScript(opts.npm, {isLocal: true}).then(npmPath => { + if (npmPath) { + args.unshift(opts.npm) + return process.argv[0] + } else { + return opts.npm + } }).then(npmPath => { return child.exec(npmPath, args) }).then(require('dotenv').parse) @@ -188,9 +192,13 @@ function getNpmCache (opts) { if (opts.userconfig) { args.push('--userconfig', child.escapeArg(opts.userconfig, true)) } - return which(opts.npm).catch(() => { - args.unshift(opts.npm) - return process.argv[0] + return findNodeScript(opts.npm, {isLocal: true}).then(npmPath => { + if (npmPath) { + args.unshift(opts.npm) + return process.argv[0] + } else { + return opts.npm + } }).then(npmPath => { return child.exec(npmPath, args) }).then(cache => cache.trim()) @@ -210,9 +218,13 @@ function buildArgs (specs, prefix, opts) { module.exports._installPackages = installPackages function installPackages (specs, prefix, opts) { const args = buildArgs(specs, prefix, opts) - return which(opts.npm).catch(() => { - args.unshift(opts.npm) - return process.argv[0] + return findNodeScript(opts.npm, {isLocal: true}).then(npmPath => { + if (npmPath) { + args.unshift(opts.npm) + return process.argv[0] + } else { + return opts.npm + } }).then(npmPath => { return child.escapeArg(npmPath, true) }).then(npmPath => { diff --git a/deps/npm/node_modules/libnpx/libnpx.1 b/deps/npm/node_modules/libnpx/libnpx.1 index ee37777ca1..7d9b273ef7 100644 --- a/deps/npm/node_modules/libnpx/libnpx.1 +++ b/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" \fBnpx\fR \- execute npm package binaries .SH SYNOPSIS diff --git a/deps/npm/node_modules/libnpx/package.json b/deps/npm/node_modules/libnpx/package.json index 36627edcf1..a7a6da9891 100644 --- a/deps/npm/node_modules/libnpx/package.json +++ b/deps/npm/node_modules/libnpx/package.json @@ -1,8 +1,8 @@ { - "_from": "libnpx@9.2.0", - "_id": "libnpx@9.2.0", + "_from": "libnpx@9.2.1", + "_id": "libnpx@9.2.1", "_inBundle": false, - "_integrity": "sha512-cXZxnp/Fmqip914pC+0a5S8UnqmG//bNIL+MtTt3pvpHkSa7Jhti9da+Wo3tjdzIc/V1A2zN4cO5wcnOzIWeig==", + "_integrity": "sha512-8xbZZ4+jn48kyyqgeIKKRxTie3wz/8HDP8eo7yA/bpPPmXtdSbudSc2BStSR6qCYt9Y5Jzf/h/gyxDsMmcCFGQ==", "_location": "/libnpx", "_phantomChildren": { "graceful-fs": "4.1.11", @@ -14,21 +14,21 @@ "_requested": { "type": "version", "registry": true, - "raw": "libnpx@9.2.0", + "raw": "libnpx@9.2.1", "name": "libnpx", "escapedName": "libnpx", - "rawSpec": "9.2.0", + "rawSpec": "9.2.1", "saveSpec": null, - "fetchSpec": "9.2.0" + "fetchSpec": "9.2.1" }, "_requiredBy": [ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/libnpx/-/libnpx-9.2.0.tgz", - "_shasum": "ce721ffc7bdfa275c18677b82728e6ee96a50642", - "_spec": "libnpx@9.2.0", - "_where": "/Users/zkat/Documents/code/npm", + "_resolved": "https://registry.npmjs.org/libnpx/-/libnpx-9.2.1.tgz", + "_shasum": "cef11bfa2e5ac68521a7c1b82f48ee8ba19884ae", + "_spec": "libnpx@9.2.1", + "_where": "/Users/zkat/Documents/code/release-checkouts/node/deps/npm", "author": { "name": "Kat Marchán", "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-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "9.2.0" + "version": "9.2.1" } diff --git a/deps/npm/package.json b/deps/npm/package.json index c09e538aa5..5b0ab111e2 100644 --- a/deps/npm/package.json +++ b/deps/npm/package.json @@ -64,7 +64,7 @@ "ini": "~1.3.4", "init-package-json": "~1.10.1", "lazy-property": "~1.0.0", - "libnpx": "~9.2.0", + "libnpx": "~9.2.1", "lockfile": "~1.0.3", "lodash._baseuniq": "~4.6.0", "lodash.clonedeep": "~4.5.0",