Webpack compatibility fix

See mapbox#622

lib/pre-binding.js

@@ -27,6 +27,12 @@ exports.find = function(package_json_path, opts) {
   if (napi.get_napi_build_versions(package_json, opts)) {
     napi_build_version = napi.get_best_napi_build_version(package_json, opts);
   }
+  // Try without explicit module root first
+  const { module } = versioning.evaluate(package_json, opts, napi_build_version);
+  if (existsSync(module)) {
+    return module;
+  }
+  // Fall back to absolute path
   opts = opts || {};
   if (!opts.module_root) opts.module_root = path.dirname(package_json_path);
   const meta = versioning.evaluate(package_json, opts, napi_build_version);

lib/util/versioning.js

@@ -315,14 +315,14 @@ module.exports.evaluate = function(package_json, options, napi_build_version) {
   const validModuleName = opts.module_name.replace('-', '_');
   const host = process.env['npm_config_' + validModuleName + '_binary_host_mirror'] || package_json.binary.host;
   opts.host = fix_slashes(eval_template(host, opts));
-  opts.module_path = eval_template(package_json.binary.module_path, opts);
+  opts.module_relative_path = eval_template(package_json.binary.module_path, opts);
   // now we resolve the module_path to ensure it is absolute so that binding.gyp variables work predictably
   if (options.module_root) {
     // resolve relative to known module root: works for pre-binding require
-    opts.module_path = path.join(options.module_root, opts.module_path);
+    opts.module_path = path.join(options.module_root, opts.module_relative_path);
   } else {
     // resolve relative to current working directory: works for node-pre-gyp commands
-    opts.module_path = path.resolve(opts.module_path);
+    opts.module_path = path.resolve(opts.module_relative_path);
   }
   opts.module = path.join(opts.module_path, opts.module_name + '.node');
   opts.remote_path = package_json.binary.remote_path ? drop_double_slashes(fix_slashes(eval_template(package_json.binary.remote_path, opts))) : default_remote_path;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapbox/node-pre-gyp",
   "description": "Node.js native addon binary install tool",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "keywords": [
     "native",
     "addon",

test/app1/index.js

@@ -3,4 +3,4 @@ var path = require('path')
 var binding_path = binary.find(path.resolve(path.join(__dirname,'./package.json')));
 var binding = require(binding_path);
 
-require('assert').equal(binding.hello(),"hello");
+require('assert').equal(binding.hello(),"hello");