From 5e8bafa263902e45482b80b59aa4e4a5f61305fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Sat, 6 May 2017 01:17:38 -0700 Subject: pacote@2.7.7 --- node_modules/pacote/CHANGELOG.md | 20 +++++++++++++++++ node_modules/pacote/lib/fetchers/git.js | 8 +++++-- node_modules/pacote/lib/util/pack-dir.js | 4 +++- .../node_modules/make-fetch-happen/CHANGELOG.md | 10 +++++++++ .../node_modules/node-fetch-npm/CHANGELOG.md | 25 +++++++++++++++++++++ .../node_modules/node-fetch-npm/package.json | 22 +++++++++--------- .../node_modules/node-fetch-npm/src/index.js | 16 ++++++++++++- .../node_modules/make-fetch-happen/package.json | 26 +++++++++++----------- .../pacote/node_modules/minimatch/package.json | 21 ++++++++--------- node_modules/pacote/package.json | 12 +++++----- node_modules/pacote/prefetch.js | 6 ++--- 11 files changed, 123 insertions(+), 47 deletions(-) (limited to 'node_modules') diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md index 2f1cd6d03..d717611fa 100644 --- a/node_modules/pacote/CHANGELOG.md +++ b/node_modules/pacote/CHANGELOG.md @@ -2,6 +2,26 @@ 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. + +## [2.7.8](https://github.com/zkat/pacote/compare/v2.7.7...v2.7.8) (2017-05-07) + + +### Bug Fixes + +* **git:** integrity hash was not always emitted ([97ed9e1](https://github.com/zkat/pacote/commit/97ed9e1)) + + + + +## [2.7.7](https://github.com/zkat/pacote/compare/v2.7.6...v2.7.7) (2017-05-06) + + +### Bug Fixes + +* **auth:** redirects no longer send auth to different host ([82e78c5](https://github.com/zkat/pacote/commit/82e78c5)) + + + ## [2.7.6](https://github.com/zkat/pacote/compare/v2.7.5...v2.7.6) (2017-05-05) diff --git a/node_modules/pacote/lib/fetchers/git.js b/node_modules/pacote/lib/fetchers/git.js index d9c132276..a2d7000ea 100644 --- a/node_modules/pacote/lib/fetchers/git.js +++ b/node_modules/pacote/lib/fetchers/git.js @@ -37,7 +37,11 @@ Fetcher.impl(fetchGit, { const stream = new PassThrough() this.manifest(spec, opts).then(manifest => { stream.emit('manifest', manifest) - return pipe(this.fromManifest(manifest, spec, opts), stream) + return pipe( + this.fromManifest( + manifest, spec, opts + ).on('integrity', i => stream.emit('integrity', i)), stream + ) }, err => stream.emit('error', err)) return stream }, @@ -51,7 +55,7 @@ Fetcher.impl(fetchGit, { opts.cache && cacache.get.stream( opts.cache, cacheKey('packed-dir', cacheName), opts - ) + ).on('integrity', i => stream.emit('integrity', i)) ) cacheStream.pipe(stream) cacheStream.on('error', err => { diff --git a/node_modules/pacote/lib/util/pack-dir.js b/node_modules/pacote/lib/util/pack-dir.js index 60989025c..54a94e586 100644 --- a/node_modules/pacote/lib/util/pack-dir.js +++ b/node_modules/pacote/lib/util/pack-dir.js @@ -32,7 +32,9 @@ function packDir (manifest, label, dir, target, opts) { } else { const cacher = cacache.put.stream( opts.cache, cacheKey('packed-dir', label), opts - ) + ).on('integrity', i => { + target.emit('integrity', i) + }) return BB.all([ pipe(packer, cacher), pipe(packer, target) diff --git a/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md b/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md index 953fd1a11..0164c37d8 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/CHANGELOG.md +++ b/node_modules/pacote/node_modules/make-fetch-happen/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. + +## [2.4.3](https://github.com/zkat/make-fetch-happen/compare/v2.4.2...v2.4.3) (2017-05-06) + + +### Bug Fixes + +* **redirect:** redirects now delete authorization if hosts fail to match ([c071805](https://github.com/zkat/make-fetch-happen/commit/c071805)) + + + ## [2.4.2](https://github.com/zkat/make-fetch-happen/compare/v2.4.1...v2.4.2) (2017-05-04) diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/CHANGELOG.md b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/CHANGELOG.md index a0b640a8d..ec77cdd02 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/CHANGELOG.md +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/CHANGELOG.md @@ -2,6 +2,31 @@ 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. + +# [2.0.0](https://github.com/npm/node-fetch-npm/compare/v1.0.1...v2.0.0) (2017-05-06) + + +### Features + +* **version:** force bump to 2.0 ([39c5d50](https://github.com/npm/node-fetch-npm/commit/39c5d50)) + + +### BREAKING CHANGES + +* **version:** tooling got confused, so hitting 2.0.0 for reals now + + + + +## [1.0.1](https://github.com/npm/node-fetch-npm/compare/v1.0.0...v1.0.1) (2017-05-06) + + +### Bug Fixes + +* **redirect:** Remove authorization header on redirect to different host ([#2](https://github.com/npm/node-fetch-npm/issues/2)) ([273260e](https://github.com/npm/node-fetch-npm/commit/273260e)) + + + # [1.0.0](https://github.com/npm/node-fetch-npm/compare/v2.0.0-alpha.3...v1.0.0) (2017-04-26) diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/package.json b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/package.json index 5199553e9..09b56c7ea 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/package.json +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/package.json @@ -1,26 +1,26 @@ { - "_from": "node-fetch-npm@^1.0.0", - "_id": "node-fetch-npm@1.0.0", - "_integrity": "sha1-X9O4sBvDd6wgQSwPruNQFoKi9fU=", + "_from": "node-fetch-npm@^2.0.0", + "_id": "node-fetch-npm@2.0.0", + "_integrity": "sha512-o8Vxcb16qHPAkqBTPIrxvGSY0dHrtwsk2opomChLWg/2MFJW/hqB3XDG78k0gyI0cmy95kSFjn4BLrMkbQFHAQ==", "_location": "/pacote/make-fetch-happen/node-fetch-npm", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "node-fetch-npm@^1.0.0", + "raw": "node-fetch-npm@^2.0.0", "name": "node-fetch-npm", "escapedName": "node-fetch-npm", - "rawSpec": "^1.0.0", + "rawSpec": "^2.0.0", "saveSpec": null, - "fetchSpec": "^1.0.0" + "fetchSpec": "^2.0.0" }, "_requiredBy": [ "/pacote/make-fetch-happen" ], - "_resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-1.0.0.tgz", - "_shasum": "5fd3b8b01bc377ac20412c0faee3501682a2f5f5", + "_resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.0.tgz", + "_shasum": "baab3734bdc50c614af5252bd1ee37a3662bf1ad", "_shrinkwrap": null, - "_spec": "node-fetch-npm@^1.0.0", + "_spec": "node-fetch-npm@^2.0.0", "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/make-fetch-happen", "author": { "name": "David Frank" @@ -56,7 +56,7 @@ "form-data": ">=1.0.0", "is-builtin-module": "^1.0.0", "mocha": "^3.1.2", - "nyc": "^10.0.0", + "nyc": "^10.3.2", "parted": "^0.1.1", "promise": "^7.1.1", "resumer": "0.0.0", @@ -98,5 +98,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": "1.0.0" + "version": "2.0.0" } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/src/index.js b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/src/index.js index aa45e9cf1..b2cf80f9e 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/src/index.js +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/src/index.js @@ -19,6 +19,7 @@ const Headers = require('./headers') const Request = require('./request') const getNodeRequestOptions = Request.getNodeRequestOptions const FetchError = require('./fetch-error') +const isURL = /^https?:/ /** * Fetch function @@ -86,6 +87,19 @@ function fetch (uri, opts) { reject(new FetchError(`redirect location header missing at: ${request.url}`, 'invalid-redirect')) return } + // Remove authorization if changing hostnames (but not if just + // changing ports or protocols). This matches the behavior of request: + // https://github.com/request/request/blob/b12a6245/lib/redirect.js#L134-L138 + const resolvedUrl = url.resolve(request.url, res.headers.location) + let redirectURL = '' + if (!isURL.test(res.headers.location)) { + redirectURL = url.parse(resolvedUrl) + } else { + redirectURL = url.parse(res.headers.location) + } + if (url.parse(request.url).hostname !== redirectURL.hostname) { + request.headers.delete('authorization') + } // per fetch spec, for POST request with 301/302 response, or any request with 303 response, use GET when following redirect if (res.statusCode === 303 || @@ -97,7 +111,7 @@ function fetch (uri, opts) { request.counter++ - resolve(fetch(url.resolve(request.url, res.headers.location), request)) + resolve(fetch(resolvedUrl, request)) return } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/package.json b/node_modules/pacote/node_modules/make-fetch-happen/package.json index 2132977a8..e74dc5d95 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/package.json +++ b/node_modules/pacote/node_modules/make-fetch-happen/package.json @@ -1,7 +1,7 @@ { - "_from": "make-fetch-happen@^2.4.2", - "_id": "make-fetch-happen@2.4.2", - "_integrity": "sha512-sEf0VCgPv7ISmbzX/sZ+xynlY26WJuB5aTG0WNVuhz1Ed0MkB5BnOfb3vS7GZRHO5n9t0Cyrlw/zlDlQKxLWvA==", + "_from": "make-fetch-happen@^2.4.3", + "_id": "make-fetch-happen@2.4.3", + "_integrity": "sha512-Vi+Y+uUnWki65KG6RjjW6J4o10XJivCyhvSh4TB/XC5gNtD9MbxlyOVkAFKTNCj1w1wcDw7HWaVPGj0CPfAyhw==", "_location": "/pacote/make-fetch-happen", "_phantomChildren": { "safe-buffer": "5.0.1" @@ -9,20 +9,20 @@ "_requested": { "type": "range", "registry": true, - "raw": "make-fetch-happen@^2.4.2", + "raw": "make-fetch-happen@^2.4.3", "name": "make-fetch-happen", "escapedName": "make-fetch-happen", - "rawSpec": "^2.4.2", + "rawSpec": "^2.4.3", "saveSpec": null, - "fetchSpec": "^2.4.2" + "fetchSpec": "^2.4.3" }, "_requiredBy": [ "/pacote" ], - "_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.2.tgz", - "_shasum": "0b1f778e55f2faa6cfa464fd6c45645a2fe43ce4", + "_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.3.tgz", + "_shasum": "a9e894f213cc4628fde0859a589a90da96f4e4d8", "_shrinkwrap": null, - "_spec": "make-fetch-happen@^2.4.2", + "_spec": "make-fetch-happen@^2.4.3", "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote", "author": { "name": "Kat Marchán", @@ -41,7 +41,7 @@ "https-proxy-agent": "^1.0.0", "lru-cache": "^4.0.2", "mississippi": "^1.2.0", - "node-fetch-npm": "^1.0.0", + "node-fetch-npm": "^2.0.0", "promise-retry": "^1.1.1", "socks-proxy-agent": "^2.0.0", "ssri": "^4.1.2" @@ -52,8 +52,8 @@ "bluebird": "^3.5.0", "mkdirp": "^0.5.1", "nock": "^9.0.6", - "npmlog": "^4.0.1", - "nyc": "^10.0.0", + "npmlog": "^4.1.0", + "nyc": "^10.3.2", "rimraf": "^2.5.4", "safe-buffer": "^5.0.1", "standard": "^10.0.1", @@ -95,5 +95,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": "2.4.2" + "version": "2.4.3" } diff --git a/node_modules/pacote/node_modules/minimatch/package.json b/node_modules/pacote/node_modules/minimatch/package.json index 3e8917d1f..aec0ec623 100644 --- a/node_modules/pacote/node_modules/minimatch/package.json +++ b/node_modules/pacote/node_modules/minimatch/package.json @@ -1,7 +1,7 @@ { "_from": "minimatch@^3.0.3", - "_id": "minimatch@3.0.3", - "_integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", + "_id": "minimatch@3.0.4", + "_integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "_location": "/pacote/minimatch", "_phantomChildren": {}, "_requested": { @@ -17,8 +17,8 @@ "_requiredBy": [ "/pacote" ], - "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "_shasum": "2a4e4090b96b2db06a9d7df01055a62a77c9b774", + "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "_shasum": "5166e286457f03306064be5497e8dbb0c3d32083", "_shrinkwrap": null, "_spec": "minimatch@^3.0.3", "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote", @@ -33,13 +33,12 @@ }, "bundleDependencies": false, "dependencies": { - "brace-expansion": "^1.0.0" + "brace-expansion": "^1.1.7" }, "deprecated": false, "description": "a glob matcher in javascript", "devDependencies": { - "standard": "^3.7.2", - "tap": "^5.6.0" + "tap": "^10.3.2" }, "engines": { "node": "*" @@ -58,8 +57,10 @@ "url": "git://github.com/isaacs/minimatch.git" }, "scripts": { - "posttest": "standard minimatch.js test/*.js", - "test": "tap test/*.js" + "postpublish": "git push origin --all; git push origin --tags", + "postversion": "npm publish", + "preversion": "npm test", + "test": "tap test/*.js --cov" }, - "version": "3.0.3" + "version": "3.0.4" } diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json index c03c53454..b4cf2a1ff 100644 --- a/node_modules/pacote/package.json +++ b/node_modules/pacote/package.json @@ -1,7 +1,7 @@ { "_from": "pacote@latest", - "_id": "pacote@2.7.6", - "_integrity": "sha512-X/y4LIEaBblP/M0mjUHCAupYTwFlqJvxRwSMnZML2rmCv/aTdwkZFxdhPMZtWy5qZmurnYoROZs/Mp9rpISA2A==", + "_id": "pacote@2.7.8", + "_integrity": "sha512-sIclvGmEKaqRZTEtm+isrs+pAMcASH/aceGzphGuDvVUSYLQ+48du2Wg0SJltfPMtabsYPRIgUf6/QaPUXbjcA==", "_location": "/pacote", "_phantomChildren": { "cacache": "9.0.0", @@ -30,8 +30,8 @@ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.6.tgz", - "_shasum": "698ea7664b58c702479939f62ad9200edf1929fa", + "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.8.tgz", + "_shasum": "91cd317ea54b2fd990c9dc00d79c5eeb1f487005", "_shrinkwrap": null, "_spec": "pacote@latest", "_where": "/Users/zkat/Documents/code/npm", @@ -59,7 +59,7 @@ "cacache": "^9.0.0", "glob": "^7.1.1", "lru-cache": "^4.0.2", - "make-fetch-happen": "^2.4.2", + "make-fetch-happen": "^2.4.3", "minimatch": "^3.0.3", "mississippi": "^1.2.0", "normalize-package-data": "^2.3.6", @@ -122,5 +122,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": "2.7.6" + "version": "2.7.8" } diff --git a/node_modules/pacote/prefetch.js b/node_modules/pacote/prefetch.js index 326c16e6d..683662f32 100644 --- a/node_modules/pacote/prefetch.js +++ b/node_modules/pacote/prefetch.js @@ -20,7 +20,7 @@ function prefetch (spec, opts) { opts.log.silly('prefetch', 'checking if', opts.integrity, 'is already cached') return cacache.get.hasContent(opts.cache, opts.integrity).then(info => { if (info) { - opts.log.silly('prefetch', 'content already exists for', spec.raw, `(${Date.now() - startTime}ms)`) + opts.log.silly('prefetch', `content already exists for ${spec} (${Date.now() - startTime}ms)`) return { spec, integrity: info.integrity, @@ -32,7 +32,7 @@ function prefetch (spec, opts) { } }) } else { - opts.log.silly('prefetch', 'no integrity hash provided for', spec, '- fetching by manifest') + opts.log.silly('prefetch', `no integrity hash provided for ${spec} - fetching by manifest`) return prefetchByManifest(startTime, spec, opts) } } @@ -52,7 +52,7 @@ function prefetchByManifest (start, spec, opts) { stream.on('integrity', i => { integrity = i }) return finished(stream) }).then(() => { - opts.log.verbose('prefetch', `${spec.name}@${spec.saveSpec || spec.fetchSpec} done in ${Date.now() - start}ms`) + opts.log.verbose('prefetch', `${spec} done in ${Date.now() - start}ms`) return { manifest, spec, -- cgit v1.2.3