Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

This commit is contained in:
Jan Steemann 2016-02-26 12:37:27 +01:00
parent 88b6828abb 041ebf1542
commit 88bfe4d0ff
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/common/bootstrap/modules.js
View File

@ -63,6 +63,7 @@ delete global.DEFINE_MODULE;
const LOADING = []; const LOADING = [];
const GLOBAL_PATHS = []; const GLOBAL_PATHS = [];
const ROOT_PATH = fs.normalize(fs.makeAbsolute(internal.startupPath));
global.MODULES_PATH.forEach(function (p) { global.MODULES_PATH.forEach(function (p) {
p = fs.normalize(fs.makeAbsolute(p)); p = fs.normalize(fs.makeAbsolute(p));
GLOBAL_PATHS.push(p); GLOBAL_PATHS.push(p);
@ -302,6 +303,10 @@ Module._nodeModulePaths = function(from, root) {
var paths = []; var paths = [];
var parts = from.split(splitRe); var parts = from.split(splitRe);
var inRoot = root && from.indexOf(root) === 0; var inRoot = root && from.indexOf(root) === 0;
if (!inRoot) {
root = ROOT_PATH;
inRoot = from.indexOf(root) === 0;
}
for (var tip = parts.length - 1; tip >= 0; tip--) { for (var tip = parts.length - 1; tip >= 0; tip--) {
// don't search in .../node_modules/node_modules // don't search in .../node_modules/node_modules