diff --git a/.npmignore b/.npmignore index 551dd571..c4a8fd68 100644 --- a/.npmignore +++ b/.npmignore @@ -2,8 +2,6 @@ build node_modules coverage .editorconfig -.jshintignore -.jshintrc .gitignore test .travis.yml diff --git a/docs/install.md b/docs/install.md index 71cebd2b..ac32ef4e 100644 --- a/docs/install.md +++ b/docs/install.md @@ -19,7 +19,7 @@ yarn add sharp [![Ubuntu 14.04 Build Status](https://travis-ci.org/lovell/sharp.png?branch=master)](https://travis-ci.org/lovell/sharp) [![Linux Build Status](https://circleci.com/gh/lovell/sharp.svg?style=svg&circle-token=6cb6d1d287a51af83722b19ed8885377fbc85e5c)](https://circleci.com/gh/lovell/sharp) -libvips and its dependencies are fetched and stored within `node_modules/sharp/lib` during `npm install`. +libvips and its dependencies are fetched and stored within `node_modules/sharp/vendor` during `npm install`. This involves an automated HTTPS download of approximately 6.5MB. Most recent Linux-based operating systems with glibc running on x64 and ARMv6+ CPUs should "just work", e.g.: @@ -62,8 +62,8 @@ via `sharp.cache(false)` to avoid a stack overflow. [![OS X 10.9.5 Build Status](https://travis-ci.org/lovell/sharp.png?branch=master)](https://travis-ci.org/lovell/sharp) -libvips and its dependencies are fetched and stored within `node_modules/sharp/lib` during `npm install`. -This involves an automated HTTPS download of approximately 6.5MB. +libvips and its dependencies are fetched and stored within `node_modules/sharp/vendor` during `npm install`. +This involves an automated HTTPS download of approximately 6.3MB. To use your own version of libvips instead of the provided binaries, make sure it is at least the version listed under `config.libvips` in the `package.json` file and @@ -73,7 +73,7 @@ that it can be located using `pkg-config --modversion vips-cpp`. [![Windows x64 Build Status](https://ci.appveyor.com/api/projects/status/pgtul704nkhhg6sg)](https://ci.appveyor.com/project/lovell/sharp) -libvips and its dependencies are fetched and stored within `node_modules\sharp` during `npm install`. +libvips and its dependencies are fetched and stored within `node_modules\sharp\vendor` during `npm install`. This involves an automated HTTPS download of approximately 9MB. Only 64-bit (x64) `node.exe` is supported. diff --git a/package.json b/package.json index cfca52b5..a460e83e 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "dependencies": { "caw": "^2.0.0", "color": "^0.11.3", - "got": "^6.6.0", + "got": "^6.6.3", "nan": "^2.4.0", "semver": "^5.3.0", "tar": "^2.2.1" @@ -69,7 +69,7 @@ "async": "^2.1.2", "bufferutil": "^1.2.1", "cross-env": "^3.1.3", - "documentation": "^4.0.0-beta11", + "documentation": "^4.0.0-beta12", "exif-reader": "^1.0.1", "icc": "^0.0.2", "mocha": "^3.1.2",