fsevents 1.1.1 → 1.2.2

package/node_modules/node-pre-gyp/lib/util/abi_crosswalk.json

@@ -1231,6 +1231,38 @@
     "node_abi": 46,
     "v8": "4.5"
   },
+  "4.8.0": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.1": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.2": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.3": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.4": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.5": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.6": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
+  "4.8.7": {
+    "node_abi": 46,
+    "v8": "4.5"
+  },
   "5.0.0": {
     "node_abi": 47,
     "v8": "4.6"
@@ -1383,6 +1415,70 @@
     "node_abi": 48,
     "v8": "5.1"
   },
+  "6.10.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.10.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.10.2": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.10.3": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.2": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.3": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.4": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.11.5": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.2": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.12.3": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.13.0": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.13.1": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
   "7.0.0": {
     "node_abi": 51,
     "v8": "5.4"
@@ -1410,5 +1506,177 @@
   "7.5.0": {
     "node_abi": 51,
     "v8": "5.4"
+  },
+  "7.6.0": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.7.0": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.7.1": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.7.2": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.7.3": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.7.4": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.8.0": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.9.0": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.10.0": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "7.10.1": {
+    "node_abi": 51,
+    "v8": "5.5"
+  },
+  "8.0.0": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.0": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.1": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.2": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.3": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.1.4": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.2.0": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.2.1": {
+    "node_abi": 57,
+    "v8": "5.8"
+  },
+  "8.3.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.4.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.5.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.6.0": {
+    "node_abi": 57,
+    "v8": "6.0"
+  },
+  "8.7.0": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.8.0": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.8.1": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.0": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.1": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.2": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.3": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.9.4": {
+    "node_abi": 57,
+    "v8": "6.1"
+  },
+  "8.10.0": {
+    "node_abi": 57,
+    "v8": "6.2"
+  },
+  "9.0.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.1.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.2.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.2.1": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.3.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.4.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.5.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.6.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.6.1": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.7.0": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.7.1": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
+  "9.8.0": {
+    "node_abi": 59,
+    "v8": "6.2"
   }
 }

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

@@ -4,6 +4,7 @@ module.exports = exports = handle_gyp_opts;
 
 var fs = require('fs');
 var versioning = require('./versioning.js');
+var napi = require('./napi.js');
 
 /*
 
@@ -44,6 +45,9 @@ var share_with_node_gyp = [
   'module',
   'module_name',
   'module_path',
+  'napi_version',
+  'node_abi_napi',
+  'napi_build_version'
 ];
 
 function handle_gyp_opts(gyp, argv, callback) {
@@ -51,13 +55,15 @@ function handle_gyp_opts(gyp, argv, callback) {
     // Collect node-pre-gyp specific variables to pass to node-gyp
     var node_pre_gyp_options = [];
     // generate custom node-pre-gyp versioning info
-    var opts = versioning.evaluate(JSON.parse(fs.readFileSync('./package.json')), gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(JSON.parse(fs.readFileSync('./package.json')), gyp.opts, napi_build_version);
     share_with_node_gyp.forEach(function(key) {
         var val = opts[key];
         if (val) {
             node_pre_gyp_options.push('--' + key + '=' + val);
         } else {
-            return callback(new Error("Option " + key + " required but not found by node-pre-gyp"));
+            if (key !== 'napi_version' && key !== 'node_abi_napi' && key !== 'napi_build_version')
+                return callback(new Error("Option " + key + " required but not found by node-pre-gyp"));
         }
     });
 

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

@@ -0,0 +1,156 @@
+"use strict";
+
+var fs = require('fs');
+var rm = require('rimraf');
+
+module.exports = exports;
+
+var versionArray = process.version
+	.substr(1)
+	.replace(/-.*$/, '')
+	.split('.')
+	.map(function(item) {
+		return +item;
+	});
+
+var napi_multiple_commands = [
+	'build',
+	'clean',
+	'configure',
+	'package',
+	'publish',
+	'reveal',
+	'testbinary',
+	'testpackage',
+	'unpublish'
+];
+
+var napi_build_version_tag = 'napi_build_version=';
+
+module.exports.get_napi_version = function() {
+	// returns the non-zero numeric napi version or undefined if napi is not supported.
+	var version = process.versions.napi; // can be undefined
+	if (!version) { // this code should never need to be updated
+		if (versionArray[0] === 9 && versionArray[1] >= 3) version = 2; // 9.3.0+
+		else if (versionArray[0] === 8) version = 1; // 8.0.0+
+	}
+	return version;
+};
+
+module.exports.get_napi_version_as_string = function() {
+	// returns the napi version as a string or an empty string if napi is not supported.
+	var version = module.exports.get_napi_version();
+	return version ? ''+version : '';
+};
+
+module.exports.validate_package_json = function(package_json) { // return err
+	var binary = package_json.binary;
+	var module_path_ok = binary.module_path && binary.module_path.indexOf('{napi_build_version}') !== -1;
+	var remote_path_ok = binary.remote_path && binary.remote_path.indexOf('{napi_build_version}') !== -1;
+	var package_name_ok = binary.package_name && binary.package_name.indexOf('{napi_build_version}') !== -1;
+	var napi_build_versions = module.exports.get_napi_build_versions(package_json);
+
+	if (napi_build_versions) {
+		napi_build_versions.forEach(function(napi_build_version){
+			if (!(parseInt(napi_build_version,10) === napi_build_version && napi_build_version > 0)) {
+				throw new Error("All values specified in napi_versions must be positive integers.");
+			}
+		});
+	}
+
+	if (napi_build_versions && (!module_path_ok || (!remote_path_ok && !package_name_ok))) {
+		throw new Error("When napi_versions is specified; module_path and either remote_path or " +
+			"package_name must contain the substitution string '{napi_build_version}`.");
+	}
+
+	if ((module_path_ok || remote_path_ok || package_name_ok) && !napi_build_versions) {
+		throw new Error("When the substitution string '{napi_build_version}` is specified in " +
+			"module_path, remote_path, or package_name; napi_versions must also be specified.");
+	}
+
+	if (napi_build_versions && !module.exports.get_best_napi_build_version(package_json)) {
+		throw new Error(
+			'The N-API version of this Node instance is ' + module.exports.get_napi_version() + '. ' +
+			'This module supports N-API version(s) ' + module.exports.get_napi_build_versions(package_json) + '. ' +
+			'This Node instance cannot run this module.');
+	}
+
+};
+
+module.exports.expand_commands = function(package_json, commands) {
+	var expanded_commands = [];
+	var napi_build_versions = module.exports.get_napi_build_versions(package_json);
+	commands.forEach(function(command){
+		if (napi_build_versions && command.name === 'install') {
+			var napi_build_version = module.exports.get_best_napi_build_version(package_json);
+			var args = napi_build_version ? [ napi_build_version_tag+napi_build_version ] : [ ];
+			expanded_commands.push ({ name: command.name, args: args });
+		} else if (napi_build_versions && napi_multiple_commands.includes(command.name)) {
+			napi_build_versions.forEach(function(napi_build_version){
+				var args = command.args.slice();
+				args.push (napi_build_version_tag+napi_build_version);
+				expanded_commands.push ({ name: command.name, args: args });
+			});
+		} else {
+			expanded_commands.push (command);
+		}
+	});
+	return expanded_commands;
+};
+
+module.exports.get_napi_build_versions = function(package_json) {
+	var napi_build_versions = [];
+	if (package_json.binary && package_json.binary.napi_versions) { // remove duplicates
+		package_json.binary.napi_versions.forEach(function(napi_version) {
+			if (!napi_build_versions.includes(napi_version)) napi_build_versions.push(napi_version);
+		});
+	}
+	return napi_build_versions.length ? napi_build_versions : undefined;
+};
+
+module.exports.get_command_arg = function(napi_build_version) {
+	return napi_build_version_tag + napi_build_version;
+};
+
+module.exports.get_napi_build_version_from_command_args = function(command_args) {
+	for (var i = 0; i < command_args.length; i++) {
+		var arg = command_args[i];
+		if (arg.indexOf(napi_build_version_tag) === 0) {
+			return parseInt(arg.substr(napi_build_version_tag.length),10);
+		}
+	}
+	return undefined;
+};
+
+module.exports.swap_build_dir_out = function(napi_build_version) {
+	if (napi_build_version) {
+		rm.sync(module.exports.get_build_dir(napi_build_version));
+		fs.renameSync('build', module.exports.get_build_dir(napi_build_version));
+	}
+};
+
+module.exports.swap_build_dir_in = function(napi_build_version) {
+	if (napi_build_version) {
+		rm.sync('build');
+		fs.renameSync(module.exports.get_build_dir(napi_build_version), 'build');
+	}
+};
+
+module.exports.get_build_dir = function(napi_build_version) {
+	return 'build-tmp-napi-v'+napi_build_version;
+};
+
+module.exports.get_best_napi_build_version = function(package_json) {
+	var best_napi_build_version = 0;
+	var napi_build_versions = module.exports.get_napi_build_versions (package_json);
+	if (napi_build_versions) {
+		var our_napi_version = module.exports.get_napi_version();
+		napi_build_versions.forEach(function(napi_build_version){
+			if (napi_build_version > best_napi_build_version &&
+				napi_build_version <= our_napi_version) {
+				best_napi_build_version = napi_build_version;
+			}
+		});
+	}
+	return best_napi_build_version === 0 ? undefined : best_napi_build_version;
+};

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

@@ -5,6 +5,8 @@ module.exports = exports;
 var path = require('path');
 var semver = require('semver');
 var url = require('url');
+var detect_libc = require('detect-libc');
+var napi = require('./napi.js');
 
 var abi_crosswalk;
 
@@ -17,6 +19,14 @@ if (process.env.NODE_PRE_GYP_ABI_CROSSWALK) {
     abi_crosswalk = require('./abi_crosswalk.json');
 }
 
+var major_versions = {};
+Object.keys(abi_crosswalk).forEach(function(v) {
+    var major = v.split('.')[0];
+    if (!major_versions[major]) {
+        major_versions[major] = v;
+    }
+});
+
 function get_electron_abi(runtime, target_version) {
     if (!runtime) {
         throw new Error("get_electron_abi requires valid runtime arg");
@@ -136,6 +146,13 @@ function get_runtime_abi(runtime, target_version) {
                             break;
                         }
                     }
+                } else if (major >= 2) {
+                    // look for last release that is the same major version
+                    if (major_versions[major]) {
+                        cross_obj = abi_crosswalk[major_versions[major]];
+                        console.log('Warning: node-pre-gyp could not find exact match for ' + target_version);
+                        console.log('Warning: but node-pre-gyp successfully choose ' + major_versions[major] + ' as ABI compatible target');
+                    }
                 } else if (major === 0) { // node.js
                     if (target_parts[1] % 2 === 0) { // for stable/even node.js series
                         // look for the last release that is the same minor release
@@ -195,7 +212,7 @@ function validate_config(package_json) {
         if (missing.indexOf('binary') > -1) {
             missing.pop('binary');
         }
-        if (!o || o[p] === undefined) {
+        if (!o || o[p] === undefined || o[p] === "") {
             missing.push('binary.' + p);
         }
     });
@@ -209,6 +226,7 @@ function validate_config(package_json) {
             throw new Error("'host' protocol ("+protocol+") is invalid - only 'https:' is accepted");
         }
     }
+    napi.validate_package_json(package_json);
 }
 
 module.exports.validate_config = validate_config;
@@ -256,7 +274,7 @@ module.exports.get_process_runtime = get_process_runtime;
 var default_package_name = '{module_name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz';
 var default_remote_path = '';
 
-module.exports.evaluate = function(package_json,options) {
+module.exports.evaluate = function(package_json,options,napi_build_version) {
     options = options || {};
     validate_config(package_json);
     var v = package_json.version;
@@ -275,11 +293,15 @@ module.exports.evaluate = function(package_json,options) {
         patch: module_version.patch,
         runtime: runtime,
         node_abi: get_runtime_abi(runtime,options.target),
+        node_abi_napi: napi.get_napi_version() ? 'napi' : get_runtime_abi(runtime,options.target),
+        napi_version: napi.get_napi_version(), // non-zero numeric, undefined if unsupported
+        napi_build_version: napi_build_version, // undefined if not specified
         target: options.target || '',
         platform: options.target_platform || process.platform,
         target_platform: options.target_platform || process.platform,
         arch: options.target_arch || process.arch,
         target_arch: options.target_arch || process.arch,
+        libc: options.target_libc || detect_libc.family || 'unknown',
         module_main: package_json.main,
         toolset : options.toolset || '' // address https://github.com/mapbox/node-pre-gyp/issues/119
     };