Upgrade libvips dependency to v8.5.4, plus other bumps

This commit is contained in:
Lovell Fuller 2017-04-26 23:04:08 +01:00
parent 6592361c5a
commit 52bea15ad7
3 changed files with 9 additions and 10 deletions

View File

@ -1,6 +1,5 @@
'use strict'; 'use strict';
const util = require('util');
const color = require('color'); const color = require('color');
const is = require('./is'); const is = require('./is');
const sharp = require('../build/Release/sharp.node'); const sharp = require('../build/Release/sharp.node');
@ -143,7 +142,7 @@ function clone () {
const that = this; const that = this;
// Clone existing options // Clone existing options
const clone = this.constructor.call(); const clone = this.constructor.call();
util._extend(clone.options, this.options); clone.options = Object.assign({}, this.options);
// Pass 'finish' event to clone for Stream-based input // Pass 'finish' event to clone for Stream-based input
this.on('finish', function () { this.on('finish', function () {
// Clone inherits input data // Clone inherits input data

View File

@ -68,7 +68,7 @@
"caw": "^2.0.0", "caw": "^2.0.0",
"color": "^1.0.3", "color": "^1.0.3",
"got": "^6.7.1", "got": "^6.7.1",
"nan": "^2.5.1", "nan": "^2.6.2",
"semver": "^5.3.0", "semver": "^5.3.0",
"tar": "^2.2.1" "tar": "^2.2.1"
}, },
@ -76,18 +76,18 @@
"async": "^2.3.0", "async": "^2.3.0",
"bufferutil": "^3.0.0", "bufferutil": "^3.0.0",
"cc": "^1.0.0", "cc": "^1.0.0",
"documentation": "^4.0.0-beta.18", "documentation": "^4.0.0-rc.0",
"exif-reader": "^1.0.2", "exif-reader": "^1.0.2",
"icc": "^1.0.0", "icc": "^1.0.0",
"mocha": "^3.2.0", "mocha": "^3.3.0",
"nyc": "^10.2.0", "nyc": "^10.2.2",
"rimraf": "^2.5.4", "rimraf": "^2.5.4",
"semistandard": "^10.0.0", "semistandard": "^11.0.0",
"unzip": "^0.1.11" "unzip": "^0.1.11"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"config": { "config": {
"libvips": "8.5.1" "libvips": "8.5.4"
}, },
"engines": { "engines": {
"node": ">=4" "node": ">=4"

View File

@ -288,7 +288,7 @@ describe('Input/output', function () {
}); });
it('Fail when input is empty Buffer', function (done) { it('Fail when input is empty Buffer', function (done) {
sharp(new Buffer(0)).toBuffer().then(function () { sharp(Buffer.alloc(0)).toBuffer().then(function () {
assert(false); assert(false);
done(); done();
}).catch(function (err) { }).catch(function (err) {
@ -298,7 +298,7 @@ describe('Input/output', function () {
}); });
it('Fail when input is invalid Buffer', function (done) { it('Fail when input is invalid Buffer', function (done) {
sharp(new Buffer([0x1, 0x2, 0x3, 0x4])).toBuffer().then(function () { sharp(Buffer.from([0x1, 0x2, 0x3, 0x4])).toBuffer().then(function () {
assert(false); assert(false);
done(); done();
}).catch(function (err) { }).catch(function (err) {