fsevents 1.2.7 → 1.2.10

package/node_modules/needle/README.md

@@ -78,8 +78,7 @@ needle('get', 'https://server.com/posts/12')
   })
   .catch(function(err) {
     // ...
-  })
-});
+  });
 
 // with callback
 needle.get('ifconfig.me/all.json', function(error, response, body) {

package/node_modules/needle/examples/multipart-stream.js

@@ -2,7 +2,7 @@ var needle = require('./../');
 
 var url  = 'http://posttestserver.com/post.php?dir=needle';
 
-var black_pixel = new Buffer("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=", 'base64');
+var black_pixel = Buffer.from("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=", 'base64');
 
 var data = {
   foo: 'bar',

package/node_modules/needle/lib/auth.js

@@ -21,7 +21,7 @@ function md5(string) {
 
 function basic(user, pass) {
   var str  = typeof pass == 'undefined' ? user : [user, pass].join(':');
-  return 'Basic ' + new Buffer(str).toString('base64');
+  return 'Basic ' + Buffer.from(str).toString('base64');
 }
 
 ////////////////////

package/node_modules/needle/lib/multipart.js

@@ -73,7 +73,7 @@ function generate_part(name, part, boundary, callback) {
     }
 
     return_part += '\r\n\r\n';
-    return_part += new Buffer(String(part.value), 'utf8').toString('binary');
+    return_part += Buffer.from(String(part.value), 'utf8').toString('binary');
     append();
 
   }

package/node_modules/needle/lib/needle.js

@@ -347,7 +347,7 @@ Needle.prototype.start = function() {
              : json ? JSON.stringify(data) : stringify(data);
 
       // ensure we have a buffer so bytecount is correct.
-      body = new Buffer(body, config.encoding);
+      body = Buffer.from(body, config.encoding);
     }
 
   }
@@ -641,7 +641,7 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
           var chunk;
           while ((chunk = this.read()) !== null) {
             // We're either pushing buffers or objects, never strings.
-            if (typeof chunk == 'string') chunk = new Buffer(chunk);
+            if (typeof chunk == 'string') chunk = Buffer.from(chunk);
 
             // Push all chunks to resp.body. We'll bind them in resp.end().
             resp.body.push(chunk);
@@ -772,6 +772,8 @@ module.exports.defaults = function(obj) {
           throw new TypeError('Invalid type for ' + key + ', should be ' + valid_type);
       }
       defaults[target_key] = obj[key];
+    } else {
+      throw new Error('Invalid property for defaults:' + target_key);      
     }
   }
 

package/node_modules/needle/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "needle@^2.2.1",
-  "_id": "needle@2.2.4",
+  "_id": "needle@2.4.0",
   "_inBundle": false,
-  "_integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
+  "_integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
   "_location": "/needle",
   "_phantomChildren": {},
   "_requested": {
@@ -18,10 +18,10 @@
   "_requiredBy": [
     "/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-  "_shasum": "51931bff82533b1928b7d1d69e01f1b00ffd2a4e",
+  "_resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
+  "_shasum": "6833e74975c444642590e15a750288c5f939b57c",
   "_spec": "needle@^2.2.1",
-  "_where": "/Users/pdunkel1/Office/fsevents/fsevents/node_modules/node-pre-gyp",
+  "_where": "/Users/pipobscure/fsevents/node_modules/node-pre-gyp",
   "author": {
     "name": "Tomás Pollak",
     "email": "tomas@forkhq.com"
@@ -34,26 +34,26 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "debug": "^2.1.2",
+    "debug": "^3.2.6",
     "iconv-lite": "^0.4.4",
     "sax": "^1.2.4"
   },
   "deprecated": false,
   "description": "The leanest and most handsome HTTP client in the Nodelands.",
   "devDependencies": {
-    "JSONStream": "",
-    "jschardet": "",
-    "mocha": "",
-    "q": "",
+    "JSONStream": "^1.3.5",
+    "jschardet": "^1.6.0",
+    "mocha": "^5.2.0",
+    "q": "^1.5.1",
     "should": "^13.2.3",
     "sinon": "^2.3.0",
-    "xml2js": ""
+    "xml2js": "^0.4.19"
   },
   "directories": {
     "lib": "./lib"
   },
   "engines": {
-    "node": ">= 0.10.x"
+    "node": ">= 4.4.x"
   },
   "homepage": "https://github.com/tomas/needle#readme",
   "keywords": [
@@ -98,5 +98,5 @@
     "cookie",
     "redirect"
   ],
-  "version": "2.2.4"
+  "version": "2.4.0"
 }

package/node_modules/needle/test/basic_auth_spec.js

@@ -19,7 +19,7 @@ describe('Basic Auth', function() {
 
   var get_auth = function(header) {
     var token  = header.split(/\s+/).pop();
-    return token && new Buffer(token, 'base64').toString().split(':');
+    return token && Buffer.from(token, 'base64').toString().split(':');
   }
 
   describe('when neither username or password are passed', function() {

package/node_modules/needle/test/cookies_spec.js

@@ -129,7 +129,7 @@ describe('cookies', function() {
         needle.get(TEST_HOST + ':' + ALL_COOKIES_TEST_PORT, function(error, response) {
           should.not.exist(error)
           var whatever = 'efbfbdefbfbdefbfbdefbfbdefbfbd2defbfbdefbfbdefbfbdefbfbdefbfbdefbfbdefbfbdefbfbdefbfbd';
-          new Buffer(response.cookies.geo_city).toString('hex').should.eql(whatever)
+          Buffer.from(response.cookies.geo_city).toString('hex').should.eql(whatever)
           done();
         });
       })
@@ -302,4 +302,4 @@ describe('cookies', function() {
       });
     });
   });
-});
+});

package/node_modules/needle/test/headers_spec.js

@@ -2,7 +2,7 @@ var http    = require('http'),
     helpers = require('./helpers'),
     should  = require('should');
 
-var port = 5432;
+var port = 54321;
 
 describe('request headers', function() {
 

package/node_modules/needle/test/output_spec.js

@@ -180,7 +180,7 @@ describe('with output option', function() {
 
     describe('for a binary file', function() {
 
-      var pixel = new Buffer("base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs", "base64");
+      var pixel = Buffer.from("base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs", "base64");
 
       before(function() {
         handler = function(req, res) {

package/node_modules/needle/test/post_data_spec.js

@@ -10,7 +10,7 @@ multiparts.push(['Content-Disposition: form-data; name=\"foo\"'])
 multiparts.push(['\r\nbar\r\n----------------------NODENEEDLEHTTPCLIENT--'])
 // multiparts.push(['Content-Disposition: form-data; name=\"test\"'])
 // multiparts.push(['\r\næµè¯\r\n----------------------NODENEEDLEHTTPCLIENT--'])
-// multiparts.push(['\r\n' + new Buffer('测试').toString() + '\r\n----------------------NODENEEDLEHTTPCLIENT--'])
+// multiparts.push(['\r\n' + Buffer.from('测试').toString() + '\r\n----------------------NODENEEDLEHTTPCLIENT--'])
 
 
 describe('post data (e.g. request body)', function() {
@@ -150,7 +150,7 @@ describe('post data (e.g. request body)', function() {
             spy.called.should.be.true;
 
             spy.args[0][0].should.be.an.instanceof(String);
-            new Buffer(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
+            Buffer.from(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
             done();
           })
         })
@@ -187,7 +187,7 @@ describe('post data (e.g. request body)', function() {
           post({ foo: 'bar', test: '测试' }, { multipart: true }, function(err, resp) {
             spy.called.should.be.true;
             spy.args[0][0].should.be.an.instanceof(String);
-            new Buffer(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
+            Buffer.from(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
             done();
           })
         })
@@ -761,14 +761,14 @@ describe('post data (e.g. request body)', function() {
           it('sends request', function(done) {
             spystub_request();
 
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               check_request('get');
               done();
             })
           })
 
           it('sets Content-Type header', function(done) {
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               // should.not.exist(resp.body.headers['content-type']);
               resp.body.headers['content-type'].should.equal('application/x-www-form-urlencoded');
 
@@ -777,7 +777,7 @@ describe('post data (e.g. request body)', function() {
           })
 
           it('doesnt change default Accept header', function(done) {
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               // resp.body contains 'header' and 'body', mirroring what we sent
               resp.body.headers['accept'].should.equal('*/*');
               done();
@@ -785,7 +785,7 @@ describe('post data (e.g. request body)', function() {
           })
 
           it('writes as buffer', function(done) {
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].should.be.an.instanceof(Buffer);
               spy.args[0][0].toString().should.equal('foobar');
@@ -801,28 +801,28 @@ describe('post data (e.g. request body)', function() {
           it('sends request, without setting a querystring', function(done) {
             spystub_request();
 
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               check_request('get');
               done();
             })
           })
 
           it('sets Content-Type header', function(done) {
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['content-type'].should.equal('application/json; charset=utf-8');
               done();
             })
           })
 
           it('set Accept header to application/json', function(done) {
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['accept'].should.equal('application/json');
               done();
             })
           })
 
           it('writes JSON.stringify version of object', function(done) {
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].toString().should.eql('foobar')
               resp.body.body.should.eql('foobar');
@@ -841,21 +841,21 @@ describe('post data (e.g. request body)', function() {
           it('sends request', function(done) {
             spystub_request();
 
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               check_request('post');
               done();
             })
           })
 
           it('sets Content-Type header to www-form-urlencoded', function(done) {
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               resp.body.headers['content-type'].should.equal('application/x-www-form-urlencoded');
               done();
             })
           })
 
           it('doesnt change default Accept header', function(done) {
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               // resp.body contains 'header' and 'body', mirroring what we sent
               resp.body.headers['accept'].should.equal('*/*');
               done();
@@ -863,7 +863,7 @@ describe('post data (e.g. request body)', function() {
           })
 
           it('writes as buffer', function(done) {
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].should.be.an.instanceof(Buffer);
               spy.args[0][0].toString().should.equal('foobar');
@@ -879,28 +879,28 @@ describe('post data (e.g. request body)', function() {
           it('sends request', function(done) {
             spystub_request();
 
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               check_request('post');
               done();
             })
           })
 
           it('sets Content-Type header', function(done) {
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['content-type'].should.equal('application/json; charset=utf-8');
               done();
             })
           })
 
           it('set Accept header to application/json', function(done) {
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['accept'].should.equal('application/json');
               done();
             })
           })
 
           it('passes raw buffer (assuming its a JSON string beneath)', function(done) {
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].toString().should.eql('foobar')
               resp.body.body.should.eql('foobar');
@@ -1018,4 +1018,4 @@ describe('post data (e.g. request body)', function() {
 
   })
 
-})
+})

package/node_modules/needle/test/proxy_spec.js

@@ -51,7 +51,7 @@ describe('proxy option', function() {
 
   function get_auth(header) {
     var token  = header.split(/\s+/).pop();
-    return token && new Buffer(token, 'base64').toString().split(':');
+    return token && Buffer.from(token, 'base64').toString().split(':');
   }
 
   function no_proxy_auth(done) {

package/node_modules/needle/test/utils/test.js

@@ -46,7 +46,7 @@ function multipart_post(url){
 	var data = 'Plain text data.\nLorem ipsum dolor sit amet.\nBla bla bla.\n';
 	fs.writeFileSync(filename, data);
 
-	var black_pixel = new Buffer("data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=".replace(/^data:image\/\w+;base64,/, ""), "base64");
+	var black_pixel = Buffer.from("data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=".replace(/^data:image\/\w+;base64,/, ""), "base64");
 
 	var data = {
 		foo: 'bar',

package/node_modules/node-pre-gyp/CHANGELOG.md

@@ -1,5 +1,15 @@
 # node-pre-gyp changelog
 
+## 0.12.0
+
+- Fixed double-build problem with node v10 (https://github.com/mapbox/node-pre-gyp/pull/428)
+- Added node 11 support in the local database (https://github.com/mapbox/node-pre-gyp/pull/422)
+
+## 0.11.0
+
+- Fixed double-install problem with node v10
+- Significant N-API improvements (https://github.com/mapbox/node-pre-gyp/pull/405)
+
 ## 0.10.3
 
 - Now will use `request` over `needle` if request is installed. By default `needle` is used for `https`. This should unbreak proxy support that regressed in v0.9.0

package/node_modules/node-pre-gyp/README.md

@@ -125,7 +125,7 @@ Let's break this down:
  - Your `scripts` section should override the `install` target with `"install": "node-pre-gyp install --fallback-to-build"`. This allows node-pre-gyp to be used instead of the default npm behavior of always source compiling with `node-gyp` directly.
  - Your package.json should contain a `binary` section describing key properties you provide to allow node-pre-gyp to package optimally. They are detailed below.
 
-NOte: in the past we recommended putting `node-pre-gyp` in the `bundledDependencies`, but we no longer recommend this. In the past there were npm bugs (with node versions 0.10.x) that could lead to node-pre-gyp not being available at the right time during install (unless we bundled). This should no longer be the case. Also, for a time we recommended using `"preinstall": "npm install node-pre-gyp"` as an alternative method to avoid needing to bundle. But this did not behave predictably across all npm versions - see https://github.com/mapbox/node-pre-gyp/issues/260 for the details. So we do not recommend using `preinstall` to install `node-pre-gyp`. More history on this at https://github.com/strongloop/fsevents/issues/157#issuecomment-265545908.
+Note: in the past we recommended putting `node-pre-gyp` in the `bundledDependencies`, but we no longer recommend this. In the past there were npm bugs (with node versions 0.10.x) that could lead to node-pre-gyp not being available at the right time during install (unless we bundled). This should no longer be the case. Also, for a time we recommended using `"preinstall": "npm install node-pre-gyp"` as an alternative method to avoid needing to bundle. But this did not behave predictably across all npm versions - see https://github.com/mapbox/node-pre-gyp/issues/260 for the details. So we do not recommend using `preinstall` to install `node-pre-gyp`. More history on this at https://github.com/strongloop/fsevents/issues/157#issuecomment-265545908.
 
 ##### The `binary` object has three required properties
 
@@ -316,23 +316,25 @@ This value is of importance in two areas:
 1. The C/C++ code which needs to know against which N-API version it should compile.
 2. `node-pre-gyp` itself which must assign appropriate path and file names to avoid collisions.
 
-### Defining `NAPI_BUILD_VERSION` for the C/C++ code
+### Defining `NAPI_VERSION` for the C/C++ code
 
 The `napi_build_version` value is communicated to the C/C++ code by adding this code to the `binding.gyp` file:
 
 ```
 "defines": [
-    "NAPI_BUILD_VERSION=<(napi_build_version)",
+    "NAPI_VERSION=<(napi_build_version)",
 ]
 ```
 
-This ensures that `NAPI_BUILD_VERSION`, an integer value, is declared appropriately to the C/C++ code for each build.
+This ensures that `NAPI_VERSION`, an integer value, is declared appropriately to the C/C++ code for each build.
+
+> Note that earlier versions of this document recommended defining the symbol `NAPI_BUILD_VERSION`. `NAPI_VERSION` is prefered because it used by the N-API C/C++ headers to configure the specific N-API veriosn being requested. 
 
 ### Path and file naming requirements in `package.json`
 
 Since `node-pre-gyp` fires off multiple operations for each request, it is essential that path and file names be created in such a way as to avoid collisions. This is accomplished by imposing additional path and file naming requirements.
 
-Specifically, when performing N-API builds, the `{napi_build_version}` text substitution string  *must* be present in the `module_path` property. In addition, the `{napi_build_version}` text substitution string  *must* be present in either the `remote_path` or `package_name` property. (No problem if it's in both.)
+Specifically, when performing N-API builds, the `{napi_build_version}` text configuration value  *must* be present in the `module_path` property. In addition, the `{napi_build_version}` text configuration value  *must* be present in either the `remote_path` or `package_name` property. (No problem if it's in both.)
 
 Here's an example:
 
@@ -347,9 +349,42 @@ Here's an example:
   }
 ```
 
+## Supporting both N-API and NAN builds
+
+You may have a legacy native add-on that you wish to continue supporting for those versions of Node that do not support N-API, as you add N-API support for later Node versions. This can be accomplished by specifying the `node_napi_label` configuration value in the package.json `binary.package_name` property. 
+
+Placing the configuration value `node_napi_label` in the package.json `binary.package_name` property instructs `node-pre-gyp` to build all viable N-API binaries supported by the current Node instance. If the current Node instance does not support N-API, `node-pre-gyp` will request a traditional, non-N-API build. 
+
+The configuration value `node_napi_label` is set by `node-pre-gyp` to the type of build created, `napi` or `node`, and the version number. For N-API builds, the string contains the N-API version nad has values like `napi-v3`. For traditional, non-N-API builds, the string contains the ABI version with values like `node-v46`.
+
+Here's how the `binary` configuration above might be changed to support both N-API and NAN builds:
+
+```js
+"binary": {
+    "module_name": "your_module",
+    "module_path": "./lib/binding/{node_napi_label}",
+    "remote_path": "./{module_name}/v{version}/{configuration}/",
+    "package_name": "{platform}-{arch}-{node_napi_label}.tar.gz",
+    "host": "https://your_bucket.s3-us-west-1.amazonaws.com",
+    "napi_versions": [1,3]
+  }
+```
+
+The C/C++ symbol `NAPI_VERSION` can be used to distinguish N-API and non-N-API builds. The value of `NAPI_VERSION` is set to the integer N-API version for N-API builds and is set to `0` for non-N-API builds. 
+
+For example:
+ 
+```C
+#if NAPI_VERSION
+// N-API code goes here
+#else
+// NAN code goes here
+#endif
+```
+
 ### Two additional configuration values
 
-For those who need them in legacy projects, two additional configuration values are available for all builds.
+The following two configuration values, which were implemented in previous versions of `node-pre-gyp`, continue to exist, but have been replaced by the `node_napi_label` configuration value described above.
 
 1. `napi_version` If N-API is supported by the currently executing Node instance, this value is the N-API version number supported by Node. If N-API is not supported, this value is an empty string.
 

package/node_modules/node-pre-gyp/lib/build.js

@@ -21,7 +21,7 @@ function do_build(gyp,argv,callback) {
             napi.swap_build_dir_in(result.opts.napi_build_version);
         }
         compile.run_gyp(final_args,result.opts,function(err) {
-            if (!err && result.opts.napi_build_version) {
+            if (result.opts.napi_build_version) {
                 napi.swap_build_dir_out(result.opts.napi_build_version);
             }
             return callback(err);

package/node_modules/node-pre-gyp/lib/install.js

@@ -92,6 +92,7 @@ function place_binary(from,to,opts,callback) {
         if (!req) return callback(new Error("empty req"));
         var badDownload = false;
         var extractCount = 0;
+        var hasResponse = false;
         var tar = require('tar');
 
         function afterTarball(err) {
@@ -112,27 +113,38 @@ function place_binary(from,to,opts,callback) {
         // for request compatibility
         req.on('error', function(err) {
             badDownload = true;
-            return callback(err);
+            if (!hasResponse) {
+                hasResponse = true;
+                return callback(err);
+            }
         });
 
         // for needle compatibility
         req.on('err', function(err) {
             badDownload = true;
-            return callback(err);
+            if (!hasResponse) {
+                hasResponse = true;
+                return callback(err);
+            }
         });
 
         req.on('close', function () {
-            if (extractCount === 0) {
+            if (!hasResponse) {
+                hasResponse = true;
                 return callback(new Error('Connection closed while downloading tarball file'));
             }
         });
 
       req.on('response', function(res) {
-           // ignore redirects, needle handles these automatically.
-           if (http_get.type === 'needle' && res.headers.hasOwnProperty('location') && res.headers.location !== '') {
-               return;
-           }
-           if (res.statusCode !== 200) {
+            // ignore redirects, needle handles these automatically.
+            if (http_get.type === 'needle' && res.headers.hasOwnProperty('location') && res.headers.location !== '') {
+                return;
+            }
+            if (hasResponse) {
+                return;
+            }
+            hasResponse = true;
+            if (res.statusCode !== 200) {
                 badDownload = true;
                 var err = new Error(res.statusCode + ' status code downloading tarball ' + from);
                 err.statusCode = res.statusCode;

package/node_modules/node-pre-gyp/lib/node-pre-gyp.js

@@ -135,7 +135,7 @@ proto.parseArgv = function parseOpts (argv) {
   if (dir == null) dir = process.cwd();
   var package_json = JSON.parse(fs.readFileSync(path.join(dir,'package.json')));
 
-  this.todo = napi.expand_commands (package_json, commands);
+  this.todo = napi.expand_commands (package_json, this.opts, commands);
 
   // support for inheriting config env variables from npm
   var npm_config_prefix = 'npm_config_';

package/node_modules/node-pre-gyp/lib/pre-binding.js

@@ -9,8 +9,8 @@ module.exports = exports;
 
 exports.usage = 'Finds the require path for the node-pre-gyp installed module';
 
-exports.validate = function(package_json) {
-    versioning.validate_config(package_json);
+exports.validate = function(package_json,opts) {
+    versioning.validate_config(package_json,opts);
 };
 
 exports.find = function(package_json_path,opts) {
@@ -18,10 +18,10 @@ exports.find = function(package_json_path,opts) {
         throw new Error("package.json does not exist at " + package_json_path);
    }
    var package_json = require(package_json_path);
-   versioning.validate_config(package_json);
+   versioning.validate_config(package_json,opts);
    var napi_build_version;
-   if (napi.get_napi_build_versions (package_json)) {
-       napi_build_version = napi.get_best_napi_build_version(package_json);
+   if (napi.get_napi_build_versions (package_json, opts)) {
+       napi_build_version = napi.get_best_napi_build_version(package_json, opts);
    }
    opts = opts || {};
    if (!opts.module_root) opts.module_root = path.dirname(package_json_path);

package/node_modules/node-pre-gyp/lib/rebuild.js

@@ -13,7 +13,7 @@ function rebuild (gyp, argv, callback) {
     { name: 'clean', args: [] },
     { name: 'build', args: ['rebuild'] }
     ];
-  commands = napi.expand_commands(package_json, commands);
+  commands = napi.expand_commands(package_json, gyp.opts, commands);
   for (var i = commands.length; i !== 0; i--) {
     gyp.todo.unshift(commands[i-1]);
   }

package/node_modules/node-pre-gyp/lib/reinstall.js

@@ -10,7 +10,7 @@ var napi = require('./util/napi.js');
 function rebuild (gyp, argv, callback) {
   var package_json = JSON.parse(fs.readFileSync('./package.json'));
   var installArgs = [];
-  var napi_build_version = napi.get_best_napi_build_version(package_json);
+  var napi_build_version = napi.get_best_napi_build_version(package_json, gyp.opts);
   if (napi_build_version != null) installArgs = [ napi.get_command_arg (napi_build_version) ];
   gyp.todo.unshift(
       { name: 'clean', args: [] },