Comparing version 8.0.0 to 8.0.1
@@ -5,2 +5,13 @@ # Change Log | ||
<a name="8.0.1"></a> | ||
## [8.0.1](https://github.com/zkat/npx/compare/v8.0.0...v8.0.1) (2017-06-27) | ||
### Bug Fixes | ||
* **npm:** bump npm version for more bugfixes ([30711a8](https://github.com/zkat/npx/commit/30711a8)) | ||
* **npm:** Use --parseable option to work around output quirks ([8cb75a2](https://github.com/zkat/npx/commit/8cb75a2)) | ||
<a name="8.0.0"></a> | ||
@@ -7,0 +18,0 @@ # [8.0.0](https://github.com/zkat/npx/compare/v7.0.0...v8.0.0) (2017-06-24) |
@@ -116,3 +116,5 @@ #!/usr/bin/env node | ||
function getEnv (opts) { | ||
return child.exec(opts.npm, ['run', 'env']).then(require('dotenv').parse) | ||
return child.exec(opts.npm, [ | ||
'run', 'env', '--parseable' | ||
]).then(require('dotenv').parse) | ||
} | ||
@@ -169,3 +171,3 @@ | ||
return which(opts.npm).then(npmPath => { | ||
const args = ['config', 'get', 'cache'] | ||
const args = ['config', 'get', 'cache', '--parseable'] | ||
if (opts.userconfig) { | ||
@@ -172,0 +174,0 @@ args.push('--userconfig', child.escapeArg(opts.userconfig, true)) |
@@ -0,1 +1,50 @@ | ||
## v5.0.4 (2017-06-13): | ||
Hey y'all. This is another minor patch release with a variety of little fixes | ||
we've been accumulating~ | ||
* [`f0a37ace9`](https://github.com/npm/npm/commit/f0a37ace9ab7879cab20f2b0fcd7840bfc305feb) | ||
Fix `npm doctor` when hitting registries without `ping`. | ||
([@zkat](https://github.com/zkat)) | ||
* [`64f0105e8`](https://github.com/npm/npm/commit/64f0105e81352b42b72900d83b437b90afc6d9ce) | ||
Fix invalid format error when setting cache-related headers. | ||
([@Kat Marchán](https://github.com/Kat Marchán)) | ||
* [`d2969c80e`](https://github.com/npm/npm/commit/d2969c80e4178faebf0f7c4cab6eb610dd953cc6) | ||
Fix spurious `EINTEGRITY` issue. | ||
([@zkat](https://github.com/zkat)) | ||
* [`800cb2b4e`](https://github.com/npm/npm/commit/800cb2b4e2d0bd00b5c9082a896f2110e907eb0b) | ||
[#17076](https://github.com/npm/npm/pull/17076) | ||
Use legacy `from` field to improve upgrade experience from legacy shrinkwraps | ||
and installs. | ||
([@zkat](https://github.com/zkat)) | ||
* [`4100d47ea`](https://github.com/npm/npm/commit/4100d47ea58b4966c02604f71350b5316108df6a) | ||
[#17007](https://github.com/npm/npm/pull/17007) | ||
Restore loose semver parsing to match older npm behavior when running into | ||
invalid semver ranges in dependencies. | ||
([@zkat](https://github.com/zkat)) | ||
* [`35316cce2`](https://github.com/npm/npm/commit/35316cce2ca2d8eb94161ec7fe7e8f7bec7b3aa7) | ||
[#17005](https://github.com/npm/npm/pull/17005) | ||
Emulate npm@4's behavior of simply marking the peerDep as invalid, instead of | ||
crashing. | ||
([@zkat](https://github.com/zkat)) | ||
* [`e7e8ee5c5`](https://github.com/npm/npm/commit/e7e8ee5c57c7238655677e118a8809b652019f53) | ||
[#16937](https://github.com/npm/npm/pull/16937) | ||
Workaround for separate bug where `requested` was somehow null. | ||
([@forivall](https://github.com/forivall)) | ||
* [`2d9629bb2`](https://github.com/npm/npm/commit/2d9629bb2043cff47eaad2654a64d2cef5725356) | ||
Better logging output for git errors. | ||
([@zkat](https://github.com/zkat)) | ||
* [`2235aea73`](https://github.com/npm/npm/commit/2235aea73569fb9711a06fa6344ef31247177dcd) | ||
More scp-url fixes: parsing only worked correctly when a committish was | ||
present. | ||
([@zkat](https://github.com/zkat)) | ||
* [`80c33cf5e`](https://github.com/npm/npm/commit/80c33cf5e6ef207450949764de41ea96538c636e) | ||
Standardize package permissions on tarball extraction, instead of using perms | ||
from the tarball. This matches previous npm behavior and fixes a number of | ||
incompatibilities in the wild. | ||
([@zkat](https://github.com/zkat)) | ||
* [`2b1e40efb`](https://github.com/npm/npm/commit/2b1e40efba0b3d1004259efa4275cf42144e3ce3) | ||
Limit shallow cloning to hosts which are known to support it. | ||
([@zkat](https://github.com/zkat)) | ||
## v5.0.3 (2017-06-05) | ||
@@ -29,3 +78,3 @@ | ||
cache. | ||
([@Kat Marchán](https://github.com/Kat Marchán)) | ||
([@zkat](https://github.com/zkat)) | ||
* [`191d10a66`](https://github.com/npm/npm/commit/191d10a6616d72e26d89fd00f5a4f6158bfbc526) | ||
@@ -32,0 +81,0 @@ [#16918](https://github.com/npm/npm/pull/16918) |
@@ -44,3 +44,4 @@ var extend = Object.assign || require('util')._extend | ||
'rm': 'uninstall', | ||
'r': 'uninstall' | ||
'r': 'uninstall', | ||
'rum': 'run-script' | ||
} | ||
@@ -47,0 +48,0 @@ |
@@ -50,3 +50,7 @@ 'use strict' | ||
strictSSL: npm.config.get('strict-ssl'), | ||
userAgent: npm.config.get('user-agent') | ||
userAgent: npm.config.get('user-agent'), | ||
dmode: npm.modes.exec, | ||
fmode: npm.modes.file, | ||
umask: npm.modes.umask | ||
} | ||
@@ -53,0 +57,0 @@ |
@@ -7,5 +7,3 @@ var log = require('npmlog') | ||
tracker.info('checkPing', 'Pinging registry') | ||
ping({}, true, function (err, pong, data, res) { | ||
if (err) { return cb(err) } | ||
tracker.finish() | ||
ping({}, true, (_err, pong, data, res) => { | ||
cb(null, [res.statusCode, res.statusMessage]) | ||
@@ -12,0 +10,0 @@ }) |
@@ -77,3 +77,3 @@ 'use strict' | ||
try { | ||
return semver.satisfies(child.package.version, requested.fetchSpec) | ||
return semver.satisfies(child.package.version, requested.fetchSpec, true) | ||
} catch (e) { | ||
@@ -629,3 +629,6 @@ return false | ||
var version = tree.package.peerDependencies[pkgname] | ||
var match = findRequirement(tree.parent || tree, pkgname, npa.resolve(pkgname, version)) | ||
try { | ||
var spec = npa.resolve(pkgname, version) | ||
} catch (e) {} | ||
var match = spec && findRequirement(tree.parent || tree, pkgname, spec) | ||
if (!match) onInvalid(tree, pkgname, version) | ||
@@ -632,0 +635,0 @@ }) |
@@ -8,2 +8,9 @@ 'use strict' | ||
return npa.resolve(name, sw.version, where) | ||
} else if (sw.from) { | ||
const spec = npa(sw.from, where) | ||
if (spec.registry && sw.version) { | ||
return npa.resolve(name, sw.version, where) | ||
} else if (!sw.resolved) { | ||
return spec | ||
} | ||
} | ||
@@ -13,8 +20,4 @@ if (sw.resolved) { | ||
} | ||
if (sw.from) { | ||
var spec = npa(sw.from, where) | ||
if (!spec.registry) return spec | ||
} | ||
} catch (_) { } | ||
return npa.resolve(name, sw.version, where) | ||
} |
@@ -110,3 +110,3 @@ 'use strict' | ||
var pkginfo = deps[moduleName(child)] = {} | ||
var req = child.package._requested || getRequested(child) | ||
var req = child.package._requested || getRequested(child) || {} | ||
if (req.type === 'directory' || req.type === 'file') { | ||
@@ -113,0 +113,0 @@ pkginfo.version = 'file:' + path.relative(top.path, child.package._resolved || req.fetchSpec) |
@@ -204,6 +204,6 @@ 'use strict' | ||
// ...and various combinations. The username in the beginning is *required*. | ||
const matched = spec.match(/^git\+ssh:\/\/([^:]+:[^#]+(?:\.git)?)(?:#(.*))$/i) | ||
const matched = spec.match(/^git\+ssh:\/\/([^:#]+:[^#]+(?:\.git)?)(?:#(.*))?$/i) | ||
return matched && !matched[1].match(/:[0-9]+\/?.*$/i) && { | ||
fetchSpec: matched[1], | ||
gitCommittish: matched[2] | ||
gitCommittish: matched[2] || 'master' | ||
} | ||
@@ -210,0 +210,0 @@ } |
{ | ||
"_args": [ | ||
[ | ||
"npm-package-arg@5.1.1", | ||
"/Users/zkat/Documents/code/npx" | ||
] | ||
], | ||
"_from": "npm-package-arg@latest", | ||
"_id": "npm-package-arg@5.1.1", | ||
"_from": "npm-package-arg@5.1.2", | ||
"_id": "npm-package-arg@5.1.2", | ||
"_inBundle": true, | ||
"_integrity": "sha512-67wPa1moaLvn9YAVLLECpGe+v3jL82pBDTE2jMxLOQHd0kWBLnmtCqbxrFagp5pVNFukqmtYRruK3wfoeVTZ2g==", | ||
"_integrity": "sha512-wJBsrf0qpypPT7A0LART18hCdyhpCMxeTtcb0X4IZO2jsP6Om7EHN1d9KSKiqD+KVH030RVNpWS9thk+pb7wzA==", | ||
"_location": "/npm/npm-package-arg", | ||
@@ -17,10 +11,11 @@ "_phantomChildren": {}, | ||
"registry": true, | ||
"raw": "npm-package-arg@5.1.1", | ||
"raw": "npm-package-arg@5.1.2", | ||
"name": "npm-package-arg", | ||
"escapedName": "npm-package-arg", | ||
"rawSpec": "5.1.1", | ||
"rawSpec": "5.1.2", | ||
"saveSpec": null, | ||
"fetchSpec": "5.1.1" | ||
"fetchSpec": "5.1.2" | ||
}, | ||
"_requiredBy": [ | ||
"/npm", | ||
"/npm/init-package-json", | ||
@@ -31,6 +26,6 @@ "/npm/npm-registry-client", | ||
], | ||
"_resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz", | ||
"_shasum": "a3d09053f2d8a0bfa562624507baa597737fc3bf", | ||
"_spec": "5.1.1", | ||
"_where": "/Users/zkat/Documents/code/npx", | ||
"_resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz", | ||
"_shasum": "fb18d17bb61e60900d6312619919bd753755ab37", | ||
"_spec": "npm-package-arg@5.1.2", | ||
"_where": "/Users/zkat/Documents/code/npm", | ||
"author": { | ||
@@ -74,3 +69,3 @@ "name": "Isaac Z. Schlueter", | ||
}, | ||
"version": "5.1.1" | ||
"version": "5.1.2" | ||
} |
@@ -5,2 +5,43 @@ # Change Log | ||
<a name="2.7.34"></a> | ||
## [2.7.34](https://github.com/zkat/pacote/compare/v2.7.33...v2.7.34) (2017-06-09) | ||
### Bug Fixes | ||
* **git:** whitelist specific shallow-cloneable hosts ([b210cc8](https://github.com/zkat/pacote/commit/b210cc8)) | ||
<a name="2.7.33"></a> | ||
## [2.7.33](https://github.com/zkat/pacote/compare/v2.7.32...v2.7.33) (2017-06-08) | ||
### Bug Fixes | ||
* **git:** better error reporting when ls-remote fails ([10aae8f](https://github.com/zkat/pacote/commit/10aae8f)) | ||
<a name="2.7.32"></a> | ||
## [2.7.32](https://github.com/zkat/pacote/compare/v2.7.31...v2.7.32) (2017-06-07) | ||
### Bug Fixes | ||
* **registry:** print both 111 and 199 warnings ([2f8c201](https://github.com/zkat/pacote/commit/2f8c201)) | ||
<a name="2.7.31"></a> | ||
## [2.7.31](https://github.com/zkat/pacote/compare/v2.7.30...v2.7.31) (2017-06-06) | ||
### Bug Fixes | ||
* **extract:** always return a bluebird promise ([06ca91d](https://github.com/zkat/pacote/commit/06ca91d)) | ||
* **registry:** bump make-fetch-happen for local cache header issue fix ([868615c](https://github.com/zkat/pacote/commit/868615c)) | ||
<a name="2.7.30"></a> | ||
@@ -7,0 +48,0 @@ ## [2.7.30](https://github.com/zkat/pacote/compare/v2.7.29...v2.7.30) (2017-06-05) |
@@ -39,3 +39,3 @@ 'use strict' | ||
opts.log.silly('pacote', 'no tarball hash provided for', spec.name, '- extracting by manifest') | ||
return retry((tryAgain, attemptNum) => { | ||
return BB.resolve(retry((tryAgain, attemptNum) => { | ||
return extractByManifest( | ||
@@ -58,3 +58,3 @@ startTime, spec, dest, opts | ||
}) | ||
}, {retries: 1}) | ||
}, {retries: 1})) | ||
} | ||
@@ -61,0 +61,0 @@ } |
@@ -68,3 +68,3 @@ 'use strict' | ||
return cloneRepo( | ||
manifest._repo, manifest._ref, manifest._rawRef, tmp, opts | ||
spec, manifest._repo, manifest._ref, manifest._rawRef, tmp, opts | ||
).then(HEAD => { | ||
@@ -162,4 +162,6 @@ if (streamError) { throw streamError } | ||
function cloneRepo (repo, resolvedRef, rawRef, tmp, opts) { | ||
if (resolvedRef) { | ||
// Only certain whitelisted hosted gits support shadow cloning | ||
const SHALLOW_HOSTS = new Set(['github', 'gist', 'gitlab', 'bitbucket']) | ||
function cloneRepo (spec, repo, resolvedRef, rawRef, tmp, opts) { | ||
if (resolvedRef && spec.hosted && SHALLOW_HOSTS.has(spec.hosted.type)) { | ||
return git.shallow(repo, resolvedRef.ref, tmp, opts) | ||
@@ -166,0 +168,0 @@ } else { |
@@ -26,5 +26,7 @@ 'use strict' | ||
opts.log.warn('registry', `Using stale data from ${registry} because the host is inaccessible -- are you offline?`) | ||
} else if (warnings['199']) { | ||
} | ||
if (warnings['199']) { | ||
opts.log.warn('registry', `Unexpected warning for ${registry}: ${warnings['199'].message}`) | ||
} else if (warnings['111']) { | ||
} | ||
if (warnings['111']) { | ||
// 111 Revalidation failed -- we're using stale data | ||
@@ -31,0 +33,0 @@ opts.log.warn( |
@@ -91,3 +91,3 @@ 'use strict' | ||
})).then(res => res.json().then(packument => { | ||
packument._cached = res.headers.has('x-local-cache') | ||
packument._cached = decodeURIComponent(res.headers.has('x-local-cache')) | ||
packument._contentLength = +res.headers.get('content-length') | ||
@@ -94,0 +94,0 @@ // NOTE - we need to call pickMem again because proxy |
@@ -54,3 +54,6 @@ 'use strict' | ||
}, opts)).then(res => { | ||
stream.emit('integrity', res.headers.get('x-local-cache-hash')) | ||
const hash = res.headers.get('x-local-cache-hash') | ||
if (hash) { | ||
stream.emit('integrity', decodeURIComponent(hash)) | ||
} | ||
res.body.on('error', err => stream.emit('error', err)) | ||
@@ -57,0 +60,0 @@ res.body.pipe(stream) |
@@ -112,4 +112,9 @@ 'use strict' | ||
let stdout = '' | ||
let stderr = '' | ||
child.stdout.on('data', d => { stdout += d }) | ||
return finished(child).then(() => { | ||
child.stderr.on('data', d => { stderr += d }) | ||
return finished(child).catch(err => { | ||
err.message = `Error while executing:\n${GITPATH} ls-remote -h -t ${repo}\n\n${stderr}\n${err.message}` | ||
throw err | ||
}).then(() => { | ||
return stdout.split('\n').reduce((revs, line) => { | ||
@@ -116,0 +121,0 @@ const split = line.split(/\s+/, 2) |
@@ -253,6 +253,6 @@ 'use strict' | ||
function addCacheHeaders (resHeaders, path, key, hash, time) { | ||
resHeaders.set('X-Local-Cache', path) | ||
resHeaders.set('X-Local-Cache-Key', key) | ||
resHeaders.set('X-Local-Cache-Hash', hash) | ||
resHeaders.set('X-Local-Cache', encodeURIComponent(path)) | ||
resHeaders.set('X-Local-Cache-Key', encodeURIComponent(key)) | ||
resHeaders.set('X-Local-Cache-Hash', encodeURIComponent(hash)) | ||
resHeaders.set('X-Local-Cache-Time', new Date(time).toUTCString()) | ||
} |
@@ -5,2 +5,12 @@ # Change Log | ||
<a name="2.4.12"></a> | ||
## [2.4.12](https://github.com/zkat/make-fetch-happen/compare/v2.4.11...v2.4.12) (2017-06-06) | ||
### Bug Fixes | ||
* **cache:** encode x-local-cache-etc headers to be header-safe ([dc9fb1b](https://github.com/zkat/make-fetch-happen/commit/dc9fb1b)) | ||
<a name="2.4.11"></a> | ||
@@ -7,0 +17,0 @@ ## [2.4.11](https://github.com/zkat/make-fetch-happen/compare/v2.4.10...v2.4.11) (2017-06-05) |
{ | ||
"_args": [ | ||
[ | ||
"make-fetch-happen@2.4.11", | ||
"/Users/zkat/Documents/code/npx" | ||
] | ||
], | ||
"_from": "make-fetch-happen@^2.4.11", | ||
"_id": "make-fetch-happen@2.4.11", | ||
"_from": "make-fetch-happen@^2.4.12", | ||
"_id": "make-fetch-happen@2.4.12", | ||
"_inBundle": true, | ||
"_integrity": "sha512-3dbl9CVS9Y0hqVzcD5HBYnaNUGw3XWpmeTqGT6ACRrmKS7WKwSDfv5+Gd1K0X/Mt52hsvZwtOH8hrNIulYkhag==", | ||
"_integrity": "sha512-7nqjivrk3WElOcoikc8tvRM3appfY2G6DO/rrRS86dxJE/DuO6QuPJqNkXmPf+DqVTeO+tmBqrtEjEqMWR2WSw==", | ||
"_location": "/npm/pacote/make-fetch-happen", | ||
@@ -17,10 +11,10 @@ "_phantomChildren": { | ||
"_requested": { | ||
"type": "version", | ||
"type": "range", | ||
"registry": true, | ||
"raw": "make-fetch-happen@2.4.11", | ||
"raw": "make-fetch-happen@^2.4.12", | ||
"name": "make-fetch-happen", | ||
"escapedName": "make-fetch-happen", | ||
"rawSpec": "2.4.11", | ||
"rawSpec": "^2.4.12", | ||
"saveSpec": null, | ||
"fetchSpec": "2.4.11" | ||
"fetchSpec": "^2.4.12" | ||
}, | ||
@@ -30,6 +24,6 @@ "_requiredBy": [ | ||
], | ||
"_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.11.tgz", | ||
"_shasum": "0b29967da2dc995e88f778dd0c673855ec7613e3", | ||
"_spec": "2.4.11", | ||
"_where": "/Users/zkat/Documents/code/npx", | ||
"_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz", | ||
"_shasum": "5e16f97b3e1fc30017da82ba4b4a5529e773f399", | ||
"_spec": "make-fetch-happen@^2.4.12", | ||
"_where": "/Users/zkat/Documents/code/npm/node_modules/pacote", | ||
"author": { | ||
@@ -103,3 +97,3 @@ "name": "Kat Marchán", | ||
}, | ||
"version": "2.4.11" | ||
"version": "2.4.12" | ||
} |
@@ -18,3 +18,3 @@ var chownr = require('chownr') | ||
var normalize = !win32 ? echo : function (name) { | ||
return name.replace(/\\/g, '/').replace(/:/g, '_') | ||
return name.replace(/\\/g, '/').replace(/[:?<>|]/g, '_') | ||
} | ||
@@ -21,0 +21,0 @@ |
{ | ||
"_args": [ | ||
[ | ||
"tar-fs@1.15.2", | ||
"/Users/zkat/Documents/code/npx" | ||
] | ||
], | ||
"_from": "tar-fs@^1.15.1", | ||
"_id": "tar-fs@1.15.2", | ||
"_id": "tar-fs@1.15.3", | ||
"_inBundle": true, | ||
"_integrity": "sha1-dh9bMpMsezlGGmDVN/rqDYCEgww=", | ||
"_integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=", | ||
"_location": "/npm/pacote/tar-fs", | ||
@@ -17,10 +11,10 @@ "_phantomChildren": { | ||
"_requested": { | ||
"type": "version", | ||
"type": "range", | ||
"registry": true, | ||
"raw": "tar-fs@1.15.2", | ||
"raw": "tar-fs@^1.15.1", | ||
"name": "tar-fs", | ||
"escapedName": "tar-fs", | ||
"rawSpec": "1.15.2", | ||
"rawSpec": "^1.15.1", | ||
"saveSpec": null, | ||
"fetchSpec": "1.15.2" | ||
"fetchSpec": "^1.15.1" | ||
}, | ||
@@ -30,11 +24,9 @@ "_requiredBy": [ | ||
], | ||
"_resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz", | ||
"_shasum": "761f5b32932c7b39461a60d537faea0d8084830c", | ||
"_shrinkwrap": null, | ||
"_spec": "1.15.2", | ||
"_where": "/Users/zkat/Documents/code/npx", | ||
"_resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz", | ||
"_shasum": "eccf935e941493d8151028e636e51ce4c3ca7f20", | ||
"_spec": "tar-fs@^1.15.1", | ||
"_where": "/Users/zkat/Documents/code/npm/node_modules/pacote", | ||
"author": { | ||
"name": "Mathias Buus" | ||
}, | ||
"bin": null, | ||
"bugs": { | ||
@@ -72,4 +64,2 @@ "url": "https://github.com/mafintosh/tar-fs/issues" | ||
"name": "tar-fs", | ||
"optionalDependencies": {}, | ||
"peerDependencies": {}, | ||
"repository": { | ||
@@ -82,3 +72,3 @@ "type": "git", | ||
}, | ||
"version": "1.15.2" | ||
"version": "1.15.3" | ||
} |
{ | ||
"_args": [ | ||
[ | ||
"pacote@2.7.30", | ||
"/Users/zkat/Documents/code/npx" | ||
] | ||
], | ||
"_from": "pacote@2.7.30", | ||
"_id": "pacote@2.7.30", | ||
"_from": "pacote@2.7.34", | ||
"_id": "pacote@2.7.34", | ||
"_inBundle": true, | ||
"_integrity": "sha512-xFxozbxytemyfNPZmkL2seTD15mozK8ghov9npjBO4YTs3SnA8I55aiN94eZJ+XhLKzbN8yXqQMr9ti4c3WIDw==", | ||
"_integrity": "sha512-7ckPYopKYndv/7KLMrEFzRZtNI008JsyxH6h8vVMgdnpCW1dDEie1iUqxoP/Ln0nWSPHEWA789YUBsiGx4p2NQ==", | ||
"_location": "/npm/pacote", | ||
@@ -19,3 +13,3 @@ "_phantomChildren": { | ||
"mkdirp": "0.5.1", | ||
"npm-package-arg": "5.1.1", | ||
"npm-package-arg": "5.1.2", | ||
"once": "1.4.0", | ||
@@ -26,3 +20,3 @@ "readable-stream": "2.2.10", | ||
"semver": "5.3.0", | ||
"ssri": "4.1.5" | ||
"ssri": "4.1.6" | ||
}, | ||
@@ -32,14 +26,16 @@ "_requested": { | ||
"registry": true, | ||
"raw": "pacote@2.7.30", | ||
"raw": "pacote@2.7.34", | ||
"name": "pacote", | ||
"escapedName": "pacote", | ||
"rawSpec": "2.7.30", | ||
"rawSpec": "2.7.34", | ||
"saveSpec": null, | ||
"fetchSpec": "2.7.30" | ||
"fetchSpec": "2.7.34" | ||
}, | ||
"_requiredBy": [], | ||
"_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.30.tgz", | ||
"_shasum": "f31678e0a40161b592498688c1e2c8d7918eac7e", | ||
"_spec": "2.7.30", | ||
"_where": "/Users/zkat/Documents/code/npx", | ||
"_requiredBy": [ | ||
"/npm" | ||
], | ||
"_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.34.tgz", | ||
"_shasum": "57d316284901d1830833137d51dc148be3efbfcc", | ||
"_spec": "pacote@2.7.34", | ||
"_where": "/Users/zkat/Documents/code/npm", | ||
"author": { | ||
@@ -68,3 +64,3 @@ "name": "Kat Marchán", | ||
"lru-cache": "^4.0.2", | ||
"make-fetch-happen": "^2.4.11", | ||
"make-fetch-happen": "^2.4.12", | ||
"minimatch": "^3.0.4", | ||
@@ -97,3 +93,3 @@ "mississippi": "^1.2.0", | ||
"standard": "^10.0.1", | ||
"standard-version": "^4.0.0", | ||
"standard-version": "^4.1.0", | ||
"tacks": "^1.2.6", | ||
@@ -131,3 +127,3 @@ "tap": "^10.3.3", | ||
}, | ||
"version": "2.7.30" | ||
"version": "2.7.34" | ||
} |
@@ -5,2 +5,12 @@ # Change Log | ||
<a name="4.1.6"></a> | ||
## [4.1.6](https://github.com/zkat/ssri/compare/v4.1.5...v4.1.6) (2017-06-07) | ||
### Bug Fixes | ||
* **checkStream:** make sure to pass all opts through ([0b1bcbe](https://github.com/zkat/ssri/commit/0b1bcbe)) | ||
<a name="4.1.5"></a> | ||
@@ -7,0 +17,0 @@ ## [4.1.5](https://github.com/zkat/ssri/compare/v4.1.4...v4.1.5) (2017-06-05) |
@@ -217,8 +217,5 @@ 'use strict' | ||
const P = opts.Promise || Promise | ||
const checker = integrityStream({ | ||
integrity: sri, | ||
size: opts.size, | ||
strict: opts.strict, | ||
pickAlgorithm: opts.pickAlgorithm | ||
}) | ||
const checker = integrityStream(Object.assign({}, opts, { | ||
integrity: sri | ||
})) | ||
return new P((resolve, reject) => { | ||
@@ -225,0 +222,0 @@ stream.pipe(checker) |
{ | ||
"_args": [ | ||
[ | ||
"ssri@4.1.5", | ||
"/Users/zkat/Documents/code/npx" | ||
] | ||
], | ||
"_from": "ssri@4.1.5", | ||
"_id": "ssri@4.1.5", | ||
"_from": "ssri@4.1.6", | ||
"_id": "ssri@4.1.6", | ||
"_inBundle": true, | ||
"_integrity": "sha512-TaLitc/pZH1UF8LCgZWdbssPiOUcPjBmIJsYJa+YltP77mY2qQ0Y2b+VS4C9RbZRH1GPMt4zckqqBd7GE/61ew==", | ||
"_integrity": "sha512-WUbCdgSAMQjTFZRWvSPpauryvREEA+Krn19rx67UlJEJx/M192ZHxMmJXjZ4tkdFm+Sb0SXGlENeQVlA5wY7kA==", | ||
"_location": "/npm/ssri", | ||
@@ -17,10 +11,11 @@ "_phantomChildren": {}, | ||
"registry": true, | ||
"raw": "ssri@4.1.5", | ||
"raw": "ssri@4.1.6", | ||
"name": "ssri", | ||
"escapedName": "ssri", | ||
"rawSpec": "4.1.5", | ||
"rawSpec": "4.1.6", | ||
"saveSpec": null, | ||
"fetchSpec": "4.1.5" | ||
"fetchSpec": "4.1.6" | ||
}, | ||
"_requiredBy": [ | ||
"/npm", | ||
"/npm/cacache", | ||
@@ -31,6 +26,6 @@ "/npm/npm-registry-client", | ||
], | ||
"_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.5.tgz", | ||
"_shasum": "e3844770b5379ced69b512e70a28d86d86abd43a", | ||
"_spec": "4.1.5", | ||
"_where": "/Users/zkat/Documents/code/npx", | ||
"_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz", | ||
"_shasum": "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b", | ||
"_spec": "ssri@4.1.6", | ||
"_where": "/Users/zkat/Documents/code/npm", | ||
"author": { | ||
@@ -53,3 +48,3 @@ "name": "Kat Marchán", | ||
"dependencies": { | ||
"safe-buffer": "^5.0.1" | ||
"safe-buffer": "^5.1.0" | ||
}, | ||
@@ -61,4 +56,4 @@ "deprecated": false, | ||
"standard": "^9.0.2", | ||
"standard-version": "^4.0.0", | ||
"tap": "^10.3.2", | ||
"standard-version": "^4.1.0", | ||
"tap": "^10.3.3", | ||
"weallbehave": "^1.2.0", | ||
@@ -101,3 +96,3 @@ "weallcontribute": "^1.0.8" | ||
}, | ||
"version": "4.1.5" | ||
"version": "4.1.6" | ||
} |
{ | ||
"_args": [ | ||
[ | ||
"npm@5.0.3", | ||
"/Users/zkat/Documents/code/npx" | ||
] | ||
], | ||
"_from": "npm@5.0.3", | ||
"_id": "npm@5.0.3", | ||
"_from": "npm@5.0.4", | ||
"_id": "npm@5.0.4", | ||
"_inBundle": false, | ||
"_integrity": "sha512-mnDS+181aU952rCrHnLr1eyHOUbpCE2VrTYt1N/MXK0JRgUneofhHzuDXiwrNY0JmNb1n0VrHdwDEqS6x1iukQ==", | ||
"_integrity": "sha512-XHgyGq7zj5PyQgUeslQRhT3tmWoiwO8X7/LjD/okW8CAQSx95GiMiVjecu62u3kge8EZfgqB/+5dHteubf+8UA==", | ||
"_location": "/npm", | ||
@@ -17,14 +11,16 @@ "_phantomChildren": {}, | ||
"registry": true, | ||
"raw": "npm@5.0.3", | ||
"raw": "npm@5.0.4", | ||
"name": "npm", | ||
"escapedName": "npm", | ||
"rawSpec": "5.0.3", | ||
"rawSpec": "5.0.4", | ||
"saveSpec": null, | ||
"fetchSpec": "5.0.3" | ||
"fetchSpec": "5.0.4" | ||
}, | ||
"_requiredBy": [ | ||
"#USER", | ||
"/" | ||
], | ||
"_resolved": "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz", | ||
"_spec": "5.0.3", | ||
"_resolved": "https://registry.npmjs.org/npm/-/npm-5.0.4.tgz", | ||
"_shasum": "67a201dd6fb4de7b27d02761432fb27df12e35ce", | ||
"_spec": "npm@5.0.4", | ||
"_where": "/Users/zkat/Documents/code/npx", | ||
@@ -2048,2 +2044,10 @@ "author": { | ||
"email": "work@colinr.com" | ||
}, | ||
{ | ||
"name": "Aki", | ||
"email": "hi@akiro.se" | ||
}, | ||
{ | ||
"name": "Emily Marigold Klassen", | ||
"email": "forivall@gmail.com" | ||
} | ||
@@ -2106,3 +2110,3 @@ ], | ||
"npm-install-checks": "~3.0.0", | ||
"npm-package-arg": "~5.1.1", | ||
"npm-package-arg": "~5.1.2", | ||
"npm-registry-client": "~8.3.0", | ||
@@ -2114,3 +2118,3 @@ "npm-user-validate": "~1.0.0", | ||
"osenv": "~0.1.4", | ||
"pacote": "~2.7.30", | ||
"pacote": "~2.7.34", | ||
"path-is-inside": "~1.0.2", | ||
@@ -2134,3 +2138,3 @@ "promise-inflight": "~1.0.1", | ||
"sorted-union-stream": "~2.1.3", | ||
"ssri": "~4.1.5", | ||
"ssri": "~4.1.6", | ||
"strip-ansi": "~3.0.1", | ||
@@ -2151,2 +2155,3 @@ "tar": "~2.2.1", | ||
}, | ||
"deprecated": false, | ||
"description": "a package manager for JavaScript", | ||
@@ -2270,3 +2275,3 @@ "devDependencies": { | ||
}, | ||
"version": "5.0.3" | ||
"version": "5.0.4" | ||
} |
@@ -28,3 +28,2 @@ 'use strict' | ||
version: '1.0.0', | ||
from: 'modA', | ||
resolved: 'file://' + modAtgz | ||
@@ -34,3 +33,2 @@ }, | ||
version: '1.0.0', | ||
from: 'modB@1', | ||
resolved: 'file://' + modB1tgz | ||
@@ -79,3 +77,2 @@ } | ||
version: '1.0.0', | ||
from: 'modA', | ||
resolved: 'file://' + modAtgz | ||
@@ -85,3 +82,2 @@ }, | ||
version: '1.0.0', | ||
from: 'modB@1', | ||
resolved: 'file://' + modB1tgz | ||
@@ -91,3 +87,2 @@ }, | ||
version: '1.0.0', | ||
from: 'modC', | ||
resolved: 'file://' + modCtgz, | ||
@@ -97,3 +92,2 @@ dependencies: { | ||
version: '1.0.0', | ||
from: 'modB@1', | ||
resolved: 'file://' + modB1tgz | ||
@@ -100,0 +94,0 @@ } |
@@ -57,3 +57,2 @@ 'use strict' | ||
version: '1.0.0', | ||
from: 'mod1', | ||
resolved: 'file:mod1', | ||
@@ -64,3 +63,2 @@ optional: true | ||
version: '1.0.0', | ||
from: 'mod2', | ||
resolved: 'file:mod2', | ||
@@ -67,0 +65,0 @@ optional: true |
@@ -89,3 +89,2 @@ var path = require('path') | ||
resolved: tarballURL, | ||
from: '>=1.3.1 <2', | ||
version: '1.3.1' | ||
@@ -92,0 +91,0 @@ } |
@@ -33,3 +33,2 @@ 'use strict' | ||
version: '1.0.0', | ||
from: 'modA', | ||
resolved: 'file://' + modAdir | ||
@@ -39,3 +38,2 @@ }, | ||
version: '1.0.0', | ||
from: 'modB@1', | ||
resolved: 'file://' + modB1dir | ||
@@ -42,0 +40,0 @@ } |
{ | ||
"name": "npx", | ||
"version": "8.0.0", | ||
"version": "8.0.1", | ||
"description": "execute npm package binaries", | ||
@@ -40,3 +40,3 @@ "main": "index.js", | ||
"dotenv": "^4.0.0", | ||
"npm": "^5.0.3", | ||
"npm": "^5.0.4", | ||
"npm-package-arg": "^5.1.2", | ||
@@ -43,0 +43,0 @@ "rimraf": "^2.6.1", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
244853
18032953
4339
Updatednpm@^5.0.4