module: prioritize current directory for local lookup

lib/module.js

@@ -250,8 +250,7 @@ Module._resolveLookupPaths = function(request, parent) {
   if (!parent || !parent.id || !parent.filename) {
     // make require('./path/to/foo') work - normally the path is taken
     // from realpath(__filename) but with eval there is no filename
-    var mainPaths = ['.'].concat(modulePaths);
-    mainPaths = Module._nodeModulePaths('.').concat(mainPaths);
+    var mainPaths = ['.'].concat(Module._nodeModulePaths('.'), modulePaths);
     return [request, mainPaths];
   }
 

test/fixtures/baz.js

@@ -0,0 +1 @@
+module.exports = 'perhaps I work';

test/parallel/test-module-relative-lookup.js

@@ -0,0 +1,10 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const _module = require('module'); // avoid collision with global.module
+const lookupResults = _module._resolveLookupPaths('./lodash');
+const paths = lookupResults[1];
+
+assert.strictEqual(paths[0], '.',
+  'Current directory is prioritized before node_modules for local modules');

test/parallel/test-repl-require.js

@@ -23,11 +23,11 @@ server.listen(options, function() {
   const conn = net.connect(options);
   conn.setEncoding('utf8');
   conn.on('data', (data) => answer += data);
-  conn.write('require("baz")\n.exit\n');
+  conn.write('require("baz")\nrequire("./baz")\n.exit\n');
 });
 
 process.on('exit', function() {
   assert.strictEqual(false, /Cannot find module/.test(answer));
   assert.strictEqual(false, /Error/.test(answer));
-  assert.strictEqual(true, /eye catcher/.test(answer));
+  assert.strictEqual(answer, '\'eye catcher\'\n\'perhaps I work\'\n');
 });