From 6e12a5cc022cb5a157a37df7283b6d7b3d49bdab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Mon, 5 Jun 2017 11:17:34 -0700 Subject: deps: bump cacache, pacote, ssri, readable-stream, safe-buffer --- node_modules/cacache/CHANGELOG.md | 20 ++++ node_modules/cacache/lib/util/move-file.js | 7 +- node_modules/cacache/package.json | 28 +++--- node_modules/pacote/CHANGELOG.md | 33 +++++++ node_modules/pacote/lib/fetchers/registry/fetch.js | 13 ++- node_modules/pacote/lib/util/git.js | 2 +- node_modules/pacote/lib/util/opt-check.js | 6 ++ .../node_modules/make-fetch-happen/CHANGELOG.md | 10 ++ .../node_modules/make-fetch-happen/package.json | 32 +++--- node_modules/pacote/package.json | 44 ++++----- node_modules/readable-stream/.travis.yml | 44 ++++++--- node_modules/readable-stream/README.md | 2 +- .../readable-stream/lib/_stream_readable.js | 11 +-- .../readable-stream/lib/_stream_writable.js | 5 +- .../lib/internal/streams/BufferList.js | 8 +- .../node_modules/buffer-shims/index.js | 108 --------------------- .../node_modules/buffer-shims/license.md | 19 ---- .../node_modules/buffer-shims/package.json | 54 ----------- .../node_modules/buffer-shims/readme.md | 21 ---- .../node_modules/string_decoder/README.md | 2 - .../string_decoder/lib/string_decoder.js | 5 +- .../node_modules/string_decoder/package.json | 17 ++-- node_modules/readable-stream/package.json | 34 +++---- node_modules/safe-buffer/README.md | 21 ++-- node_modules/safe-buffer/browser.js | 1 - node_modules/safe-buffer/index.js | 2 + node_modules/safe-buffer/package.json | 30 +++--- node_modules/safe-buffer/test.js | 2 + node_modules/ssri/CHANGELOG.md | 10 ++ node_modules/ssri/index.js | 1 + node_modules/ssri/package.json | 20 ++-- 31 files changed, 260 insertions(+), 352 deletions(-) delete mode 100644 node_modules/readable-stream/node_modules/buffer-shims/index.js delete mode 100644 node_modules/readable-stream/node_modules/buffer-shims/license.md delete mode 100644 node_modules/readable-stream/node_modules/buffer-shims/package.json delete mode 100644 node_modules/readable-stream/node_modules/buffer-shims/readme.md delete mode 100644 node_modules/safe-buffer/browser.js (limited to 'node_modules') diff --git a/node_modules/cacache/CHANGELOG.md b/node_modules/cacache/CHANGELOG.md index fad0f4875..802257622 100644 --- a/node_modules/cacache/CHANGELOG.md +++ b/node_modules/cacache/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. + +## [9.2.8](https://github.com/zkat/cacache/compare/v9.2.7...v9.2.8) (2017-06-05) + + +### Bug Fixes + +* **ssri:** bump ssri for bugfix ([c3232ea](https://github.com/zkat/cacache/commit/c3232ea)) + + + + +## [9.2.7](https://github.com/zkat/cacache/compare/v9.2.6...v9.2.7) (2017-06-05) + + +### Bug Fixes + +* **content:** make verified content completely read-only (#96) ([4131196](https://github.com/zkat/cacache/commit/4131196)) + + + ## [9.2.6](https://github.com/zkat/cacache/compare/v9.2.5...v9.2.6) (2017-05-31) diff --git a/node_modules/cacache/lib/util/move-file.js b/node_modules/cacache/lib/util/move-file.js index 422c8294e..e12e98188 100644 --- a/node_modules/cacache/lib/util/move-file.js +++ b/node_modules/cacache/lib/util/move-file.js @@ -2,6 +2,8 @@ const fs = require('graceful-fs') const BB = require('bluebird') +const chmod = BB.promisify(fs.chmod) +const unlink = BB.promisify(fs.unlink) let move let pinflight @@ -27,8 +29,11 @@ function moveFile (src, dest) { return cb(err) } } - return fs.unlink(src, cb) + return cb() }) + }).then(() => { + // content should never change for any reason, so make it read-only + return BB.join(unlink(src), process.platform !== 'win32' && chmod(dest, '0444')) }).catch(err => { if (process.platform !== 'win32') { throw err diff --git a/node_modules/cacache/package.json b/node_modules/cacache/package.json index 16266eb05..b55c3ba68 100644 --- a/node_modules/cacache/package.json +++ b/node_modules/cacache/package.json @@ -1,19 +1,19 @@ { - "_from": "cacache@9.2.6", - "_id": "cacache@9.2.6", + "_from": "cacache@9.2.8", + "_id": "cacache@9.2.8", "_inBundle": false, - "_integrity": "sha512-YK0Z5Np5t755edPL6gfdCeGxtU0rcW/DBhYhYVDckT+7AFkCCtedf2zru5NRbBLFk6e7Agi/RaqTOAfiaipUfg==", + "_integrity": "sha512-nA3gmaDPEsFWqI5eYAe35IfvW54yGJ3ns2wDopWf4iDA3fkhBNsdvnYp4NrL+L7ysMt0/isM84Mwi+b4l8/pMQ==", "_location": "/cacache", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "cacache@9.2.6", + "raw": "cacache@9.2.8", "name": "cacache", "escapedName": "cacache", - "rawSpec": "9.2.6", + "rawSpec": "9.2.8", "saveSpec": null, - "fetchSpec": "9.2.6" + "fetchSpec": "9.2.8" }, "_requiredBy": [ "#USER", @@ -21,9 +21,9 @@ "/pacote", "/pacote/make-fetch-happen" ], - "_resolved": "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz", - "_shasum": "ea5c7f2b6b514710a22a58a27f857fd972fdfa51", - "_spec": "cacache@9.2.6", + "_resolved": "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz", + "_shasum": "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4", + "_spec": "cacache@9.2.8", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Kat Marchán", @@ -66,7 +66,7 @@ "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", "rimraf": "^2.6.1", - "ssri": "^4.1.4", + "ssri": "^4.1.5", "unique-filename": "^1.1.0", "y18n": "^3.2.1" }, @@ -76,13 +76,13 @@ "benchmark": "^2.1.4", "chalk": "^1.1.3", "cross-env": "^5.0.0", - "nyc": "^10.3.2", + "nyc": "^11.0.2", "require-inject": "^1.4.0", - "safe-buffer": "^5.0.1", + "safe-buffer": "^5.1.0", "standard": "^10.0.2", "standard-version": "^4.0.0", "tacks": "^1.2.2", - "tap": "^10.3.2", + "tap": "^10.3.3", "weallbehave": "^1.2.0", "weallcontribute": "^1.0.8" }, @@ -125,5 +125,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.6" + "version": "9.2.8" } diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md index 33ba50715..7f7eac282 100644 --- a/node_modules/pacote/CHANGELOG.md +++ b/node_modules/pacote/CHANGELOG.md @@ -2,6 +2,39 @@ 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.30](https://github.com/zkat/pacote/compare/v2.7.29...v2.7.30) (2017-06-05) + + +### Bug Fixes + +* **ssri:** bump ssri for bugfix ([70a859c](https://github.com/zkat/pacote/commit/70a859c)) + + + + +## [2.7.29](https://github.com/zkat/pacote/compare/v2.7.28...v2.7.29) (2017-06-05) + + +### Bug Fixes + +* **registry:** use cert instead of certfile opt ([a45880d](https://github.com/zkat/pacote/commit/a45880d)) + + + + +## [2.7.28](https://github.com/zkat/pacote/compare/v2.7.27...v2.7.28) (2017-06-05) + + +### Bug Fixes + +* **git:** limit ls-remote output to heads/tags (#97) ([c1e3dcd](https://github.com/zkat/pacote/commit/c1e3dcd)) +* **proxy:** send certificate authority, key and other options (#95) ([c4b6128](https://github.com/zkat/pacote/commit/c4b6128)) +* **registry:** add support for global auth and _auth token (#96) ([7919fb7](https://github.com/zkat/pacote/commit/7919fb7)) +* **registry:** emit npm-session header (#98) ([9816b18](https://github.com/zkat/pacote/commit/9816b18)) + + + ## [2.7.27](https://github.com/zkat/pacote/compare/v2.7.26...v2.7.27) (2017-06-01) diff --git a/node_modules/pacote/lib/fetchers/registry/fetch.js b/node_modules/pacote/lib/fetchers/registry/fetch.js index 46a926a1a..1c6c8e8d6 100644 --- a/node_modules/pacote/lib/fetchers/registry/fetch.js +++ b/node_modules/pacote/lib/fetchers/registry/fetch.js @@ -16,14 +16,19 @@ function regFetch (uri, registry, opts) { algorithms: opts.algorithms, cache: getCacheMode(opts), cacheManager: opts.cache, + ca: opts.ca, + cert: opts.cert, headers: getHeaders(uri, registry, opts), integrity: opts.integrity, + key: opts.key, + localAddress: opts.localAddress, memoize: opts.memoize, noProxy: opts.noProxy, Promise: BB, proxy: opts.proxy, referer: opts.refer, retry: opts.retry, + strictSSL: !!opts.strictSSL, timeout: opts.timeout, uid: opts.uid, gid: opts.gid @@ -74,13 +79,15 @@ function getHeaders (uri, registry, opts) { const headers = Object.assign({ 'npm-in-ci': opts.isFromCI, 'npm-scope': opts.projectScope, + 'npm-session': opts.npmSession, 'user-agent': opts.userAgent, 'referer': opts.refer }, opts.headers) - const auth = ( + // check for auth settings specific to this registry + let auth = ( opts.auth && opts.auth[registryKey(registry)] - ) + ) || opts.auth // If a tarball is hosted on a different place than the manifest, only send // credentials on `alwaysAuth` const shouldAuth = auth && ( @@ -94,6 +101,8 @@ function getHeaders (uri, registry, opts) { `${auth.username}:${auth.password}`, 'utf8' ).toString('base64') headers.authorization = `Basic ${encoded}` + } else if (shouldAuth && auth._auth) { + headers.authorization = `Basic ${auth._auth}` } return headers } diff --git a/node_modules/pacote/lib/util/git.js b/node_modules/pacote/lib/util/git.js index 6a82776a2..fc3d158fa 100644 --- a/node_modules/pacote/lib/util/git.js +++ b/node_modules/pacote/lib/util/git.js @@ -105,7 +105,7 @@ function revs (repo, opts) { return BB.resolve(cached) } return pinflight(`ls-remote:${repo}`, () => { - return spawnGit(['ls-remote', repo], { + return spawnGit(['ls-remote', '-h', '-t', repo], { env: gitEnv() }, opts).then(child => { let stdout = '' diff --git a/node_modules/pacote/lib/util/opt-check.js b/node_modules/pacote/lib/util/opt-check.js index dd8aa518d..a2692836a 100644 --- a/node_modules/pacote/lib/util/opt-check.js +++ b/node_modules/pacote/lib/util/opt-check.js @@ -12,7 +12,11 @@ function PacoteOptions (opts) { this.scopeTargets = opts.scopeTargets || {} this.defaultTag = opts.defaultTag || 'latest' this.cache = opts.cache + this.ca = opts.ca + this.cert = opts.cert this.integrity = opts.integrity + this.key = opts.key + this.localAddress = opts.localAddress this.log = opts.log || silentlog this.memoize = opts.memoize this.maxSockets = opts.maxSockets || 10 @@ -26,6 +30,7 @@ function PacoteOptions (opts) { this.userAgent = opts.userAgent || `${pkg.name}@${pkg.version}/node@${process.version}+${process.arch} (${process.platform})` this.where = opts.where this.preferOnline = opts.preferOnline + this.strictSSL = !!opts.strictSSL this.isFromCI = !!( opts.isFromCI || process.env['CI'] === 'true' || @@ -33,6 +38,7 @@ function PacoteOptions (opts) { process.env['JENKINS_URL'] || process.env['bamboo.buildKey'] ) + this.npmSession = opts.npmSession this.refer = opts.referer || opts.refer this.projectScope = opts.projectScope this.fullMetadata = opts.fullMetadata 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 8e81398e1..54d88f339 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.11](https://github.com/zkat/make-fetch-happen/compare/v2.4.10...v2.4.11) (2017-06-05) + + +### Bug Fixes + +* **deps:** bump deps with ssri fix ([bef1994](https://github.com/zkat/make-fetch-happen/commit/bef1994)) + + + ## [2.4.10](https://github.com/zkat/make-fetch-happen/compare/v2.4.9...v2.4.10) (2017-05-31) 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 ced08a608..376072235 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/package.json +++ b/node_modules/pacote/node_modules/make-fetch-happen/package.json @@ -1,28 +1,28 @@ { - "_from": "make-fetch-happen@^2.4.10", - "_id": "make-fetch-happen@2.4.10", + "_from": "make-fetch-happen@^2.4.11", + "_id": "make-fetch-happen@2.4.11", "_inBundle": false, - "_integrity": "sha512-ZD9SRSC0TGlThOnnlPdDuUcKE74D8XeriPoNYEtWgBGAzKp4P7tIDWN6LvLvMSkd23HDbaUMsu9g3dO3NavZIg==", + "_integrity": "sha512-3dbl9CVS9Y0hqVzcD5HBYnaNUGw3XWpmeTqGT6ACRrmKS7WKwSDfv5+Gd1K0X/Mt52hsvZwtOH8hrNIulYkhag==", "_location": "/pacote/make-fetch-happen", "_phantomChildren": { - "safe-buffer": "5.0.1" + "safe-buffer": "5.1.0" }, "_requested": { "type": "range", "registry": true, - "raw": "make-fetch-happen@^2.4.10", + "raw": "make-fetch-happen@^2.4.11", "name": "make-fetch-happen", "escapedName": "make-fetch-happen", - "rawSpec": "^2.4.10", + "rawSpec": "^2.4.11", "saveSpec": null, - "fetchSpec": "^2.4.10" + "fetchSpec": "^2.4.11" }, "_requiredBy": [ "/pacote" ], - "_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz", - "_shasum": "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81", - "_spec": "make-fetch-happen@^2.4.10", + "_resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.11.tgz", + "_shasum": "0b29967da2dc995e88f778dd0c673855ec7613e3", + "_spec": "make-fetch-happen@^2.4.11", "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote", "author": { "name": "Kat Marchán", @@ -34,7 +34,7 @@ "bundleDependencies": false, "dependencies": { "agentkeepalive": "^3.1.0", - "cacache": "^9.2.6", + "cacache": "^9.2.7", "http-cache-semantics": "^3.7.3", "http-proxy-agent": "^1.0.0", "https-proxy-agent": "^1.0.0", @@ -43,7 +43,7 @@ "node-fetch-npm": "^2.0.1", "promise-retry": "^1.1.1", "socks-proxy-agent": "^2.1.0", - "ssri": "^4.1.4" + "ssri": "^4.1.5" }, "deprecated": false, "description": "Opinionated, caching, retrying fetch client", @@ -52,13 +52,13 @@ "mkdirp": "^0.5.1", "nock": "^9.0.6", "npmlog": "^4.1.0", - "nyc": "^10.3.2", + "nyc": "^11.0.2", "rimraf": "^2.5.4", - "safe-buffer": "^5.0.1", + "safe-buffer": "^5.1.0", "standard": "^10.0.1", "standard-version": "^4.0.0", "tacks": "^1.2.6", - "tap": "^10.2.0", + "tap": "^10.3.3", "weallbehave": "^1.0.0", "weallcontribute": "^1.0.7" }, @@ -92,5 +92,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.10" + "version": "2.4.11" } diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json index b7aa3c44d..44e5b7eca 100644 --- a/node_modules/pacote/package.json +++ b/node_modules/pacote/package.json @@ -1,40 +1,40 @@ { - "_from": "pacote@2.7.27", - "_id": "pacote@2.7.27", + "_from": "pacote@2.7.30", + "_id": "pacote@2.7.30", "_inBundle": false, - "_integrity": "sha512-NDMlLoiBu08GSnysuFxyoFpgd1fcO2vAFMr/JG/oPsr7m8B9sRfp2ozHpaXjgo0JonzxsEZr0WFm6SauZ1Rvww==", + "_integrity": "sha512-xFxozbxytemyfNPZmkL2seTD15mozK8ghov9npjBO4YTs3SnA8I55aiN94eZJ+XhLKzbN8yXqQMr9ti4c3WIDw==", "_location": "/pacote", "_phantomChildren": { - "cacache": "9.2.6", + "cacache": "9.2.8", "chownr": "1.0.1", "lru-cache": "4.0.2", "mississippi": "1.3.0", "mkdirp": "0.5.1", - "npm-package-arg": "5.0.1", + "npm-package-arg": "5.1.1", "once": "1.4.0", - "readable-stream": "2.2.9", + "readable-stream": "2.2.10", "retry": "0.10.1", - "safe-buffer": "5.0.1", + "safe-buffer": "5.1.0", "semver": "5.3.0", - "ssri": "4.1.4" + "ssri": "4.1.5" }, "_requested": { "type": "version", "registry": true, - "raw": "pacote@2.7.27", + "raw": "pacote@2.7.30", "name": "pacote", "escapedName": "pacote", - "rawSpec": "2.7.27", + "rawSpec": "2.7.30", "saveSpec": null, - "fetchSpec": "2.7.27" + "fetchSpec": "2.7.30" }, "_requiredBy": [ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz", - "_shasum": "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6", - "_spec": "pacote@2.7.27", + "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.30.tgz", + "_shasum": "f31678e0a40161b592498688c1e2c8d7918eac7e", + "_spec": "pacote@2.7.30", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Kat Marchán", @@ -56,22 +56,22 @@ ], "dependencies": { "bluebird": "^3.5.0", - "cacache": "^9.2.6", + "cacache": "^9.2.8", "glob": "^7.1.2", "lru-cache": "^4.0.2", - "make-fetch-happen": "^2.4.10", + "make-fetch-happen": "^2.4.11", "minimatch": "^3.0.4", "mississippi": "^1.2.0", "normalize-package-data": "^2.3.6", - "npm-package-arg": "^5.0.0", + "npm-package-arg": "^5.1.1", "npm-pick-manifest": "^1.0.3", "osenv": "^0.1.4", "promise-inflight": "^1.0.1", "promise-retry": "^1.1.1", "protoduck": "^4.0.0", - "safe-buffer": "^5.0.1", + "safe-buffer": "^5.1.0", "semver": "^5.3.0", - "ssri": "^4.1.4", + "ssri": "^4.1.5", "tar-fs": "^1.15.1", "tar-stream": "^1.5.4", "unique-filename": "^1.1.0", @@ -83,13 +83,13 @@ "mkdirp": "^0.5.1", "nock": "^9.0.13", "npmlog": "^4.1.0", - "nyc": "^10.3.2", + "nyc": "^11.0.2", "require-inject": "^1.4.0", "rimraf": "^2.5.4", "standard": "^10.0.1", "standard-version": "^4.0.0", "tacks": "^1.2.6", - "tap": "^10.2.0", + "tap": "^10.3.3", "weallbehave": "^1.2.0", "weallcontribute": "^1.0.7" }, @@ -120,5 +120,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.27" + "version": "2.7.30" } diff --git a/node_modules/readable-stream/.travis.yml b/node_modules/readable-stream/.travis.yml index 76b4b0cfc..0c5d2bc26 100644 --- a/node_modules/readable-stream/.travis.yml +++ b/node_modules/readable-stream/.travis.yml @@ -2,26 +2,40 @@ sudo: false language: node_js before_install: - npm install -g npm@2 - - npm install -g npm + - test $NPM_LEGACY && npm install -g npm@latest-3 || npm install npm -g notifications: email: false matrix: fast_finish: true include: - node_js: '0.8' - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: '0.10' - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: '0.11' - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: '0.12' - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: 1 - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: 2 - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: 3 - env: TASK=test + env: + - TASK=test + - NPM_LEGACY=true - node_js: 4 env: TASK=test - node_js: 5 @@ -30,17 +44,19 @@ matrix: env: TASK=test - node_js: 7 env: TASK=test - - node_js: 5 + - node_js: 8 + env: TASK=test + - node_js: 6 env: TASK=browser BROWSER_NAME=ie BROWSER_VERSION="9..latest" - - node_js: 5 + - node_js: 6 env: TASK=browser BROWSER_NAME=opera BROWSER_VERSION="11..latest" - - node_js: 5 + - node_js: 6 env: TASK=browser BROWSER_NAME=chrome BROWSER_VERSION="-3..latest" - - node_js: 5 + - node_js: 6 env: TASK=browser BROWSER_NAME=firefox BROWSER_VERSION="-3..latest" - - node_js: 5 + - node_js: 6 env: TASK=browser BROWSER_NAME=safari BROWSER_VERSION="5..latest" - - node_js: 5 + - node_js: 6 env: TASK=browser BROWSER_NAME=microsoftedge BROWSER_VERSION=latest script: "npm run $TASK" env: diff --git a/node_modules/readable-stream/README.md b/node_modules/readable-stream/README.md index 8b6e5d39b..3024d77c6 100644 --- a/node_modules/readable-stream/README.md +++ b/node_modules/readable-stream/README.md @@ -18,7 +18,7 @@ npm install --save readable-stream This package is a mirror of the Streams2 and Streams3 implementations in Node-core. -Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v7.8.0/docs/api/). +Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v7.10.0/docs/api/stream.html). If you want to guarantee a stable streams base, regardless of what version of Node you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *"stream"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html). diff --git a/node_modules/readable-stream/lib/_stream_readable.js b/node_modules/readable-stream/lib/_stream_readable.js index b19b2088b..a01012e3c 100644 --- a/node_modules/readable-stream/lib/_stream_readable.js +++ b/node_modules/readable-stream/lib/_stream_readable.js @@ -28,9 +28,8 @@ var EElistenerCount = function (emitter, type) { var Stream = require('./internal/streams/stream'); /**/ -var Buffer = require('buffer').Buffer; /**/ -var bufferShim = require('buffer-shims'); +var Buffer = require('safe-buffer').Buffer; /**/ /**/ @@ -163,7 +162,7 @@ Readable.prototype.push = function (chunk, encoding) { if (!state.objectMode && typeof chunk === 'string') { encoding = encoding || state.defaultEncoding; if (encoding !== state.encoding) { - chunk = bufferShim.from(chunk, encoding); + chunk = Buffer.from(chunk, encoding); encoding = ''; } } @@ -483,7 +482,7 @@ Readable.prototype.pipe = function (dest, pipeOpts) { var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; - var endFn = doEnd ? onend : cleanup; + var endFn = doEnd ? onend : unpipe; if (state.endEmitted) processNextTick(endFn);else src.once('end', endFn); dest.on('unpipe', onunpipe); @@ -516,7 +515,7 @@ Readable.prototype.pipe = function (dest, pipeOpts) { dest.removeListener('error', onerror); dest.removeListener('unpipe', onunpipe); src.removeListener('end', onend); - src.removeListener('end', cleanup); + src.removeListener('end', unpipe); src.removeListener('data', ondata); cleanedUp = true; @@ -873,7 +872,7 @@ function copyFromBufferString(n, list) { // This function is designed to be inlinable, so please take care when making // changes to the function body. function copyFromBuffer(n, list) { - var ret = bufferShim.allocUnsafe(n); + var ret = Buffer.allocUnsafe(n); var p = list.head; var c = 1; p.data.copy(ret); diff --git a/node_modules/readable-stream/lib/_stream_writable.js b/node_modules/readable-stream/lib/_stream_writable.js index 15db03868..e9701f500 100644 --- a/node_modules/readable-stream/lib/_stream_writable.js +++ b/node_modules/readable-stream/lib/_stream_writable.js @@ -35,9 +35,8 @@ var internalUtil = { var Stream = require('./internal/streams/stream'); /**/ -var Buffer = require('buffer').Buffer; /**/ -var bufferShim = require('buffer-shims'); +var Buffer = require('safe-buffer').Buffer; /**/ util.inherits(Writable, Stream); @@ -293,7 +292,7 @@ Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { function decodeChunk(state, chunk, encoding) { if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') { - chunk = bufferShim.from(chunk, encoding); + chunk = Buffer.from(chunk, encoding); } return chunk; } diff --git a/node_modules/readable-stream/lib/internal/streams/BufferList.js b/node_modules/readable-stream/lib/internal/streams/BufferList.js index e4bfcf02d..82598c852 100644 --- a/node_modules/readable-stream/lib/internal/streams/BufferList.js +++ b/node_modules/readable-stream/lib/internal/streams/BufferList.js @@ -1,8 +1,8 @@ 'use strict'; -var Buffer = require('buffer').Buffer; /**/ -var bufferShim = require('buffer-shims'); + +var Buffer = require('safe-buffer').Buffer; /**/ module.exports = BufferList; @@ -50,9 +50,9 @@ BufferList.prototype.join = function (s) { }; BufferList.prototype.concat = function (n) { - if (this.length === 0) return bufferShim.alloc(0); + if (this.length === 0) return Buffer.alloc(0); if (this.length === 1) return this.head.data; - var ret = bufferShim.allocUnsafe(n >>> 0); + var ret = Buffer.allocUnsafe(n >>> 0); var p = this.head; var i = 0; while (p) { diff --git a/node_modules/readable-stream/node_modules/buffer-shims/index.js b/node_modules/readable-stream/node_modules/buffer-shims/index.js deleted file mode 100644 index 1cab4c05e..000000000 --- a/node_modules/readable-stream/node_modules/buffer-shims/index.js +++ /dev/null @@ -1,108 +0,0 @@ -'use strict'; - -var buffer = require('buffer'); -var Buffer = buffer.Buffer; -var SlowBuffer = buffer.SlowBuffer; -var MAX_LEN = buffer.kMaxLength || 2147483647; -exports.alloc = function alloc(size, fill, encoding) { - if (typeof Buffer.alloc === 'function') { - return Buffer.alloc(size, fill, encoding); - } - if (typeof encoding === 'number') { - throw new TypeError('encoding must not be number'); - } - if (typeof size !== 'number') { - throw new TypeError('size must be a number'); - } - if (size > MAX_LEN) { - throw new RangeError('size is too large'); - } - var enc = encoding; - var _fill = fill; - if (_fill === undefined) { - enc = undefined; - _fill = 0; - } - var buf = new Buffer(size); - if (typeof _fill === 'string') { - var fillBuf = new Buffer(_fill, enc); - var flen = fillBuf.length; - var i = -1; - while (++i < size) { - buf[i] = fillBuf[i % flen]; - } - } else { - buf.fill(_fill); - } - return buf; -} -exports.allocUnsafe = function allocUnsafe(size) { - if (typeof Buffer.allocUnsafe === 'function') { - return Buffer.allocUnsafe(size); - } - if (typeof size !== 'number') { - throw new TypeError('size must be a number'); - } - if (size > MAX_LEN) { - throw new RangeError('size is too large'); - } - return new Buffer(size); -} -exports.from = function from(value, encodingOrOffset, length) { - if (typeof Buffer.from === 'function' && (!global.Uint8Array || Uint8Array.from !== Buffer.from)) { - return Buffer.from(value, encodingOrOffset, length); - } - if (typeof value === 'number') { - throw new TypeError('"value" argument must not be a number'); - } - if (typeof value === 'string') { - return new Buffer(value, encodingOrOffset); - } - if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) { - var offset = encodingOrOffset; - if (arguments.length === 1) { - return new Buffer(value); - } - if (typeof offset === 'undefined') { - offset = 0; - } - var len = length; - if (typeof len === 'undefined') { - len = value.byteLength - offset; - } - if (offset >= value.byteLength) { - throw new RangeError('\'offset\' is out of bounds'); - } - if (len > value.byteLength - offset) { - throw new RangeError('\'length\' is out of bounds'); - } - return new Buffer(value.slice(offset, offset + len)); - } - if (Buffer.isBuffer(value)) { - var out = new Buffer(value.length); - value.copy(out, 0, 0, value.length); - return out; - } - if (value) { - if (Array.isArray(value) || (typeof ArrayBuffer !== 'undefined' && value.buffer instanceof ArrayBuffer) || 'length' in value) { - return new Buffer(value); - } - if (value.type === 'Buffer' && Array.isArray(value.data)) { - return new Buffer(value.data); - } - } - - throw new TypeError('First argument must be a string, Buffer, ' + 'ArrayBuffer, Array, or array-like object.'); -} -exports.allocUnsafeSlow = function allocUnsafeSlow(size) { - if (typeof Buffer.allocUnsafeSlow === 'function') { - return Buffer.allocUnsafeSlow(size); - } - if (typeof size !== 'number') { - throw new TypeError('size must be a number'); - } - if (size >= MAX_LEN) { - throw new RangeError('size is too large'); - } - return new SlowBuffer(size); -} diff --git a/node_modules/readable-stream/node_modules/buffer-shims/license.md b/node_modules/readable-stream/node_modules/buffer-shims/license.md deleted file mode 100644 index 01cfaefe2..000000000 --- a/node_modules/readable-stream/node_modules/buffer-shims/license.md +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2016 Calvin Metcalf - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.** diff --git a/node_modules/readable-stream/node_modules/buffer-shims/package.json b/node_modules/readable-stream/node_modules/buffer-shims/package.json deleted file mode 100644 index 8e4af6603..000000000 --- a/node_modules/readable-stream/node_modules/buffer-shims/package.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_from": "buffer-shims@~1.0.0", - "_id": "buffer-shims@1.0.0", - "_integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=", - "_location": "/readable-stream/buffer-shims", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "buffer-shims@~1.0.0", - "name": "buffer-shims", - "escapedName": "buffer-shims", - "rawSpec": "~1.0.0", - "saveSpec": null, - "fetchSpec": "~1.0.0" - }, - "_requiredBy": [ - "/readable-stream", - "/readable-stream/string_decoder" - ], - "_resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "_shasum": "9978ce317388c649ad8793028c3477ef044a8b51", - "_shrinkwrap": null, - "_spec": "buffer-shims@~1.0.0", - "_where": "/Users/zkat/Documents/code/npm/node_modules/readable-stream", - "bin": null, - "bugs": { - "url": "https://github.com/calvinmetcalf/buffer-shims/issues" - }, - "bundleDependencies": false, - "dependencies": {}, - "deprecated": false, - "description": "some shims for node buffers", - "devDependencies": { - "tape": "^4.5.1" - }, - "files": [ - "index.js" - ], - "homepage": "https://github.com/calvinmetcalf/buffer-shims#readme", - "license": "MIT", - "main": "index.js", - "name": "buffer-shims", - "optionalDependencies": {}, - "peerDependencies": {}, - "repository": { - "type": "git", - "url": "git+ssh://git@github.com/calvinmetcalf/buffer-shims.git" - }, - "scripts": { - "test": "tape test/*.js" - }, - "version": "1.0.0" -} diff --git a/node_modules/readable-stream/node_modules/buffer-shims/readme.md b/node_modules/readable-stream/node_modules/buffer-shims/readme.md deleted file mode 100644 index 7ea6475e2..000000000 --- a/node_modules/readable-stream/node_modules/buffer-shims/readme.md +++ /dev/null @@ -1,21 +0,0 @@ -buffer-shims -=== - -functions to make sure the new buffer methods work in older browsers. - -```js -var bufferShim = require('buffer-shims'); -bufferShim.from('foo'); -bufferShim.alloc(9, 'cafeface', 'hex'); -bufferShim.allocUnsafe(15); -bufferShim.allocUnsafeSlow(21); -``` - -should just use the original in newer nodes and on older nodes uses fallbacks. - -Known Issues -=== -- this does not patch the buffer object, only the constructor stuff -- it's actually a polyfill - -![](https://i.imgur.com/zxII3jJ.gif) diff --git a/node_modules/readable-stream/node_modules/string_decoder/README.md b/node_modules/readable-stream/node_modules/string_decoder/README.md index 13d827d89..dc3a2d216 100644 --- a/node_modules/readable-stream/node_modules/string_decoder/README.md +++ b/node_modules/readable-stream/node_modules/string_decoder/README.md @@ -7,8 +7,6 @@ [![NPM](https://nodei.co/npm-dl/string_decoder.png?&months=6&height=3)](https://nodei.co/npm/string_decoder/) -[![Sauce Test Status](https://saucelabs.com/browser-matrix/string_decoder.svg)](https://saucelabs.com/u/string_decoder) - ```bash npm install --save string_decoder ``` diff --git a/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js b/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js index 696d7ab61..26fb94c34 100644 --- a/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js +++ b/node_modules/readable-stream/node_modules/string_decoder/lib/string_decoder.js @@ -1,7 +1,6 @@ 'use strict'; -var Buffer = require('buffer').Buffer; -var bufferShim = require('buffer-shims'); +var Buffer = require('safe-buffer').Buffer; var isEncoding = Buffer.isEncoding || function (encoding) { encoding = '' + encoding; @@ -78,7 +77,7 @@ function StringDecoder(encoding) { } this.lastNeed = 0; this.lastTotal = 0; - this.lastChar = bufferShim.allocUnsafe(nb); + this.lastChar = Buffer.allocUnsafe(nb); } StringDecoder.prototype.write = function (buf) { diff --git a/node_modules/readable-stream/node_modules/string_decoder/package.json b/node_modules/readable-stream/node_modules/string_decoder/package.json index fb2958ba2..cb5868ece 100644 --- a/node_modules/readable-stream/node_modules/string_decoder/package.json +++ b/node_modules/readable-stream/node_modules/string_decoder/package.json @@ -1,7 +1,8 @@ { "_from": "string_decoder@~1.0.0", - "_id": "string_decoder@1.0.0", - "_integrity": "sha1-8G9BFXtmTYYGn4S9vcmw2KsoFmc=", + "_id": "string_decoder@1.0.1", + "_inBundle": false, + "_integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", "_location": "/readable-stream/string_decoder", "_phantomChildren": {}, "_requested": { @@ -17,18 +18,16 @@ "_requiredBy": [ "/readable-stream" ], - "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz", - "_shasum": "f06f41157b664d86069f84bdbdc9b0d8ab281667", - "_shrinkwrap": null, + "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "_shasum": "62e200f039955a6810d8df0a33ffc0f013662d98", "_spec": "string_decoder@~1.0.0", "_where": "/Users/zkat/Documents/code/npm/node_modules/readable-stream", - "bin": null, "bugs": { "url": "https://github.com/rvagg/string_decoder/issues" }, "bundleDependencies": false, "dependencies": { - "buffer-shims": "~1.0.0" + "safe-buffer": "^5.0.1" }, "deprecated": false, "description": "The string_decoder module from Node core", @@ -46,8 +45,6 @@ "license": "MIT", "main": "lib/string_decoder.js", "name": "string_decoder", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/rvagg/string_decoder.git" @@ -55,5 +52,5 @@ "scripts": { "test": "tap test/parallel/*.js" }, - "version": "1.0.0" + "version": "1.0.1" } diff --git a/node_modules/readable-stream/package.json b/node_modules/readable-stream/package.json index d1bf299d0..5308555f4 100644 --- a/node_modules/readable-stream/package.json +++ b/node_modules/readable-stream/package.json @@ -1,20 +1,24 @@ { - "_from": "readable-stream@~2.2.9", - "_id": "readable-stream@2.2.9", - "_integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", + "_from": "readable-stream@2.2.10", + "_id": "readable-stream@2.2.10", + "_inBundle": false, + "_integrity": "sha512-HQEnnoV404e0EtwB9yNiuk2tJ+egeVC8Y9QBAxzDg8DBJt4BzRp+yQuIb/t3FIWkSTmIi+sgx7yVv/ZM0GNoqw==", "_location": "/readable-stream", - "_phantomChildren": {}, + "_phantomChildren": { + "safe-buffer": "5.0.1" + }, "_requested": { - "type": "range", + "type": "version", "registry": true, - "raw": "readable-stream@~2.2.9", + "raw": "readable-stream@2.2.10", "name": "readable-stream", "escapedName": "readable-stream", - "rawSpec": "~2.2.9", + "rawSpec": "2.2.10", "saveSpec": null, - "fetchSpec": "~2.2.9" + "fetchSpec": "2.2.10" }, "_requiredBy": [ + "#USER", "/", "/fs-write-stream-atomic", "/mississippi/concat-stream", @@ -34,12 +38,10 @@ "/tap/tap-mocha-reporter", "/tap/tap-parser" ], - "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", - "_shasum": "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8", - "_shrinkwrap": null, - "_spec": "readable-stream@~2.2.9", + "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz", + "_shasum": "effe72bb7c884c0dd335e2379d526196d9d011ee", + "_spec": "readable-stream@2.2.10", "_where": "/Users/zkat/Documents/code/npm", - "bin": null, "browser": { "util": false, "./readable.js": "./readable-browser.js", @@ -52,11 +54,11 @@ }, "bundleDependencies": false, "dependencies": { - "buffer-shims": "~1.0.0", "core-util-is": "~1.0.0", "inherits": "~2.0.1", "isarray": "~1.0.0", "process-nextick-args": "~1.0.6", + "safe-buffer": "^5.0.1", "string_decoder": "~1.0.0", "util-deprecate": "~1.0.1" }, @@ -85,8 +87,6 @@ "lib/**.js" ] }, - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/nodejs/readable-stream.git" @@ -99,5 +99,5 @@ "test": "tap test/parallel/*.js test/ours/*.js", "write-zuul": "printf \"ui: tape\nbrowsers:\n - name: $BROWSER_NAME\n version: $BROWSER_VERSION\n\">.zuul.yml" }, - "version": "2.2.9" + "version": "2.2.10" } diff --git a/node_modules/safe-buffer/README.md b/node_modules/safe-buffer/README.md index 96eb387aa..e9a81afd0 100644 --- a/node_modules/safe-buffer/README.md +++ b/node_modules/safe-buffer/README.md @@ -1,17 +1,20 @@ -# safe-buffer [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][npm-url] +# safe-buffer [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url] -#### Safer Node.js Buffer API - -**Use the new Node.js v6 Buffer APIs (`Buffer.from`, `Buffer.alloc`, -`Buffer.allocUnsafe`, `Buffer.allocUnsafeSlow`) in Node.js v0.10, v0.12, v4.x, and v5.x.** - -**Uses the built-in implementations when available.** - -[travis-image]: https://img.shields.io/travis/feross/safe-buffer.svg +[travis-image]: https://img.shields.io/travis/feross/safe-buffer/master.svg [travis-url]: https://travis-ci.org/feross/safe-buffer [npm-image]: https://img.shields.io/npm/v/safe-buffer.svg [npm-url]: https://npmjs.org/package/safe-buffer [downloads-image]: https://img.shields.io/npm/dm/safe-buffer.svg +[downloads-url]: https://npmjs.org/package/safe-buffer +[standard-image]: https://img.shields.io/badge/code_style-standard-brightgreen.svg +[standard-url]: https://standardjs.com + +#### Safer Node.js Buffer API + +**Use the new Node.js Buffer APIs (`Buffer.from`, `Buffer.alloc`, +`Buffer.allocUnsafe`, `Buffer.allocUnsafeSlow`) in all versions of Node.js.** + +**Uses the built-in implementation when available.** ## install diff --git a/node_modules/safe-buffer/browser.js b/node_modules/safe-buffer/browser.js deleted file mode 100644 index 0bd12027d..000000000 --- a/node_modules/safe-buffer/browser.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('buffer') diff --git a/node_modules/safe-buffer/index.js b/node_modules/safe-buffer/index.js index 74a7358ee..ea87b099d 100644 --- a/node_modules/safe-buffer/index.js +++ b/node_modules/safe-buffer/index.js @@ -1,4 +1,6 @@ +/* eslint-disable node/no-deprecated-api */ var buffer = require('buffer') +var Buffer = buffer.Buffer if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) { module.exports = buffer diff --git a/node_modules/safe-buffer/package.json b/node_modules/safe-buffer/package.json index d866dd958..8bce3da12 100644 --- a/node_modules/safe-buffer/package.json +++ b/node_modules/safe-buffer/package.json @@ -1,34 +1,36 @@ { - "_from": "safe-buffer@~5.0.1", - "_id": "safe-buffer@5.0.1", + "_from": "safe-buffer@latest", + "_id": "safe-buffer@5.1.0", "_inBundle": false, - "_integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "_integrity": "sha512-aSLEDudu6OoRr/2rU609gRmnYboRLxgDG1z9o2Q0os7236FwvcqIOO8r8U5JUEwivZOhDaKlFO4SbPTJYyBEyQ==", "_location": "/safe-buffer", "_phantomChildren": {}, "_requested": { - "type": "range", + "type": "tag", "registry": true, - "raw": "safe-buffer@~5.0.1", + "raw": "safe-buffer@latest", "name": "safe-buffer", "escapedName": "safe-buffer", - "rawSpec": "~5.0.1", + "rawSpec": "latest", "saveSpec": null, - "fetchSpec": "~5.0.1" + "fetchSpec": "latest" }, "_requiredBy": [ "#USER", - "/" + "/", + "/readable-stream", + "/readable-stream/string_decoder", + "/ssri" ], - "_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "_shasum": "d263ca54696cd8a306b5ca6551e92de57918fbe7", - "_spec": "safe-buffer@~5.0.1", + "_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz", + "_shasum": "fe4c8460397f9eaaaa58e73be46273408a45e223", + "_spec": "safe-buffer@latest", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Feross Aboukhadijeh", "email": "feross@feross.org", "url": "http://feross.org" }, - "browser": "./browser.js", "bugs": { "url": "https://github.com/feross/safe-buffer/issues" }, @@ -36,7 +38,7 @@ "deprecated": false, "description": "Safer Node.js Buffer API", "devDependencies": { - "standard": "^7.0.0", + "standard": "*", "tape": "^4.0.0", "zuul": "^3.0.0" }, @@ -60,5 +62,5 @@ "scripts": { "test": "standard && tape test.js" }, - "version": "5.0.1" + "version": "5.1.0" } diff --git a/node_modules/safe-buffer/test.js b/node_modules/safe-buffer/test.js index 7da8ad761..4925059c5 100644 --- a/node_modules/safe-buffer/test.js +++ b/node_modules/safe-buffer/test.js @@ -1,3 +1,5 @@ +/* eslint-disable node/no-deprecated-api */ + var test = require('tape') var SafeBuffer = require('./').Buffer diff --git a/node_modules/ssri/CHANGELOG.md b/node_modules/ssri/CHANGELOG.md index 2d3341c92..c03bb4174 100644 --- a/node_modules/ssri/CHANGELOG.md +++ b/node_modules/ssri/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. + +## [4.1.5](https://github.com/zkat/ssri/compare/v4.1.4...v4.1.5) (2017-06-05) + + +### Bug Fixes + +* **integrityStream:** stop crashing if opts.algorithms and opts.integrity have an algo mismatch ([fb1293e](https://github.com/zkat/ssri/commit/fb1293e)) + + + ## [4.1.4](https://github.com/zkat/ssri/compare/v4.1.3...v4.1.4) (2017-05-31) diff --git a/node_modules/ssri/index.js b/node_modules/ssri/index.js index 3367eff9b..6ec0d73df 100644 --- a/node_modules/ssri/index.js +++ b/node_modules/ssri/index.js @@ -259,6 +259,7 @@ function integrityStream (opts) { const match = ( // Integrity verification mode opts.integrity && + newSri[algorithm] && digests && digests.find(hash => { return newSri[algorithm].find(newhash => { diff --git a/node_modules/ssri/package.json b/node_modules/ssri/package.json index 58b463850..b004400f3 100644 --- a/node_modules/ssri/package.json +++ b/node_modules/ssri/package.json @@ -1,19 +1,19 @@ { - "_from": "ssri@4.1.4", - "_id": "ssri@4.1.4", + "_from": "ssri@4.1.5", + "_id": "ssri@4.1.5", "_inBundle": false, - "_integrity": "sha512-CfN7rEZZi9/eLoED+vfKpgEPXdev5D5FV2fCih8j1e+rOSrKwoXzq3HVGy5ybu5mj94lrQ1X2oP+xBjLNtPUQQ==", + "_integrity": "sha512-TaLitc/pZH1UF8LCgZWdbssPiOUcPjBmIJsYJa+YltP77mY2qQ0Y2b+VS4C9RbZRH1GPMt4zckqqBd7GE/61ew==", "_location": "/ssri", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "ssri@4.1.4", + "raw": "ssri@4.1.5", "name": "ssri", "escapedName": "ssri", - "rawSpec": "4.1.4", + "rawSpec": "4.1.5", "saveSpec": null, - "fetchSpec": "4.1.4" + "fetchSpec": "4.1.5" }, "_requiredBy": [ "#USER", @@ -23,9 +23,9 @@ "/pacote", "/pacote/make-fetch-happen" ], - "_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz", - "_shasum": "22be0659c075a612b622158872b585d5fe6b03af", - "_spec": "ssri@4.1.4", + "_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.5.tgz", + "_shasum": "e3844770b5379ced69b512e70a28d86d86abd43a", + "_spec": "ssri@4.1.5", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Kat Marchán", @@ -90,5 +90,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": "4.1.4" + "version": "4.1.5" } -- cgit v1.2.3