From 1c4f6f75f3c088500e47d8acbd6e7834f4e79a0f Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Sun, 11 Nov 2018 17:50:58 +0000
Subject: [PATCH] Add Node 11 to CI, experimental only, no prebuild Hide
 deprecation warnings - see nodejs/nan#811

---
 .travis.yml        | 25 +++++++++++++++++++++++++
 appveyor.yml       |  2 ++
 binding.gyp        | 11 ++++++++++-
 lib/constructor.js |  2 +-
 package.json       |  7 ++++---
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21bf4f48..f7866bc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,14 @@ matrix:
       after_success:
         - npm install coveralls
         - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+    - name: "Linux (glibc) - Node 11 (Experimental)"
+      os: linux
+      dist: trusty
+      sudo: false
+      language: node_js
+      node_js: "11"
+      before_install:
+        - unset PREBUILD_TOKEN
     - name: "Linux (musl) - Node 8"
       os: linux
       dist: trusty
@@ -41,6 +49,16 @@ matrix:
         - sudo docker exec sharp apk add build-base git python2 --update-cache
       install: sudo docker exec sharp sh -c "npm install --unsafe-perm"
       script: sudo docker exec sharp sh -c "npm test"
+    - name: "Linux (musl) - Node 11 (Experimental)"
+      os: linux
+      dist: trusty
+      sudo: true
+      language: minimal
+      before_install:
+        - sudo docker run -dit --name sharp --env CI --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:11-alpine
+        - sudo docker exec sharp apk add build-base git python2 --update-cache
+      install: sudo docker exec sharp sh -c "npm install --unsafe-perm"
+      script: sudo docker exec sharp sh -c "npm test"
     - name: "OS X - Node 6"
       os: osx
       osx_image: xcode9.2
@@ -56,3 +74,10 @@ matrix:
       osx_image: xcode9.2
       language: node_js
       node_js: "10"
+    - name: "OS X - Node 11 (Experimental)"
+      os: osx
+      osx_image: xcode9.2
+      language: node_js
+      node_js: "11"
+      before_install:
+        - unset PREBUILD_TOKEN
diff --git a/appveyor.yml b/appveyor.yml
index 5350bba1..00634e19 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,6 +7,8 @@ environment:
   - nodejs_version: "6"
   - nodejs_version: "8"
   - nodejs_version: "10"
+  - nodejs_version: "11"
+    PREBUILD_TOKEN: ""
 install:
   - ps: Install-Product node $env:nodejs_version x64
   - npm install -g npm@5
diff --git a/binding.gyp b/binding.gyp
index bf2e5ad8..7f3a10ad 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -183,13 +183,22 @@
     },
     'configurations': {
       'Release': {
+        'cflags_cc': [
+          '-Wno-deprecated-declarations'
+        ],
+        'xcode_settings': {
+          'OTHER_CPLUSPLUSFLAGS': [
+            '-Wno-deprecated-declarations'
+          ]
+        },
         'msvs_settings': {
           'VCCLCompilerTool': {
             'ExceptionHandling': 1
           }
         },
         'msvs_disabled_warnings': [
-          4275
+          4275,
+          4996
         ]
       }
     },
diff --git a/lib/constructor.js b/lib/constructor.js
index 130f3bab..c78378db 100644
--- a/lib/constructor.js
+++ b/lib/constructor.js
@@ -7,7 +7,7 @@ const events = require('events');
 const is = require('./is');
 
 require('./libvips').hasVendoredLibvips();
-const sharp = require('../build/Release/sharp.node');
+const sharp = require('bindings')('sharp.node');
 
 // Use NODE_DEBUG=sharp to enable libvips warnings
 const debuglog = util.debuglog('sharp');
diff --git a/package.json b/package.json
index abd6d4f1..3b11b74f 100644
--- a/package.json
+++ b/package.json
@@ -88,15 +88,16 @@
     "vips"
   ],
   "dependencies": {
+    "bindings": "^1.3.0",
     "color": "^3.1.0",
     "detect-libc": "^1.0.3",
-    "nan": "^2.11.1",
     "fs-copy-file-sync": "^1.1.1",
+    "nan": "^2.11.1",
     "npmlog": "^4.1.2",
     "prebuild-install": "^5.2.1",
     "semver": "^5.6.0",
     "simple-get": "^3.0.3",
-    "tar": "^4.4.6",
+    "tar": "^4.4.8",
     "tunnel-agent": "^0.6.0"
   },
   "devDependencies": {
@@ -109,7 +110,7 @@
     "mocha": "^5.2.0",
     "mock-fs": "^4.7.0",
     "nyc": "^13.1.0",
-    "prebuild": "^8.1.1",
+    "prebuild": "^8.1.2",
     "prebuild-ci": "^2.2.3",
     "rimraf": "^2.6.2",
     "semistandard": "^12.0.1"