remove empiric rules for FLAG_DISABLE_DOT_NODE. fixes sha3

vercel · May 24, 2017 · af10e79 · af10e79
1 parent 8c55615
commit af10e79
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/prelude/bootstrap.js b/prelude/bootstrap.js
@@ -1265,16 +1265,17 @@ var modifyNativeAddonWin32 = (function () {
   Module._resolveFilename = function (request) {
     var filename;
 
-    var reqDotNode = (request.slice(-5) === '.node'); // bindings.js: opts.bindings += '.node'
-    var reqLeftSlash = (request.indexOf('\\') >= 0);  // heapdump: require('../build/Release/addon')
-    var reqRightSlash = (request.indexOf('/') >= 0);  // slash means that non-package is required ...
-    var enable = reqDotNode || reqLeftSlash || reqRightSlash; // ... (had a problem in levelup/pouchdb)
-
-    FLAG_DISABLE_DOT_NODE = !enable;
     try {
       filename = ancestor._resolveFilename.apply(this, arguments);
-    } finally {
-      FLAG_DISABLE_DOT_NODE = false;
+    } catch (error) {
+      if (error.code !== 'MODULE_NOT_FOUND') throw error;
+
+      FLAG_DISABLE_DOT_NODE = true;
+      try {
+        filename = ancestor._resolveFilename.apply(this, arguments);
+      } finally {
+        FLAG_DISABLE_DOT_NODE = false;
+      }
     }
 
     if (!insideSnapshot(filename)) {

diff --git a/test/test-79-npm/sha3/package.json b/test/test-79-npm/sha3/package.json
@@ -0,0 +1 @@
+{ "private": true }
diff --git a/test/test-79-npm/sha3/sha3.js b/test/test-79-npm/sha3/sha3.js
@@ -0,0 +1,6 @@
+'use strict';
+
+var sha3 = require('sha3');
+if (sha3.SHA3Hash) {
+  console.log('ok');
+}
diff --git a/test/test-79-npm/sha3/sha3.meta.js b/test/test-79-npm/sha3/sha3.meta.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const home = require('../home.js');
+
+module.exports = function (stamp) {
+  return {
+    allow: home(stamp)
+  };
+};