Permalink
Browse files

Closes GH-690 node_modules folders should be highest priority

  • Loading branch information...
1 parent a48f73d commit 3599c71dae1b293b712320afbd7e3961b056d458 @isaacs isaacs committed with ry Feb 18, 2011
Showing with 9 additions and 2 deletions.
  1. +4 −0 doc/api/modules.markdown
  2. +5 −2 lib/module.js
View
4 doc/api/modules.markdown
@@ -212,6 +212,10 @@ the `NODE_PATH` environment variable might have been set to:
/home/micheil/.node_modules:/usr/local/lib/node_modules
+Loading from the `require.paths` locations is only performed if the
+module could not be found using the `node_modules` algorithm above.
+Global modules are lower priority than bundled dependencies.
+
#### **Note:** Please Avoid Modifying `require.paths`
For compatibility reasons, `require.paths` is still given first priority
View
7 lib/module.js
@@ -202,7 +202,10 @@ Module._resolveLookupPaths = function(request, parent) {
var start = request.substring(0, 2);
if (start !== './' && start !== '..') {
var paths = Module._paths;
- if (parent) paths = paths.concat(parent.paths);
+ if (parent) {
+ if (!parent.paths) parent.paths = [];
+ paths = parent.paths.concat(paths);
+ }
return [request, paths];
}
@@ -211,7 +214,7 @@ Module._resolveLookupPaths = function(request, parent) {
// make require('./path/to/foo') work - normally the path is taken
// from realpath(__filename) but with eval there is no filename
var mainPaths = ['.'].concat(Module._paths);
- mainPaths = mainPaths.concat(Module._nodeModulePaths('.'));
+ mainPaths = Module._nodeModulePaths('.').concat(mainPaths);
return [request, mainPaths];
}

0 comments on commit 3599c71

Please sign in to comment.