module: fix require in node repl

Fixes: #30808
PR-URL: #30835
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

Author: ZYSzys

lib/internal/modules/cjs/loader.js

@@ -810,11 +810,11 @@ Module._resolveLookupPaths = function(request, parent) {
 returnpaths.length>0 ? paths : null;
 }
 
-// With --eval, parent.id is not set and parent.filename is null.
+// In REPL, parent.filename is null.
 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
-constmainPaths=['.'].concat(Module._nodeModulePaths('.'),modulePaths);
+// from realpath(__filename) but in REPL there is no filename
+constmainPaths=['.'];
 
 debug('looking for %j in %j',request,mainPaths);
 returnmainPaths;

test/parallel/test-repl-require.js

@@ -11,28 +11,61 @@ if (!common.isMainThread)
 process.chdir(fixtures.fixturesDir);
 constrepl=require('repl');
 
-constserver=net.createServer((conn)=>{
-repl.start('',conn).on('exit',()=>{
-conn.destroy();
-server.close();
+{
+constserver=net.createServer((conn)=>{
+repl.start('',conn).on('exit',()=>{
+conn.destroy();
+server.close();
+});
 });
-});
-
-consthost=common.localhostIPv4;
-constport=0;
-constoptions={ host, port };
-
-letanswer='';
-server.listen(options,function(){
-options.port=this.address().port;
-constconn=net.connect(options);
-conn.setEncoding('utf8');
-conn.on('data',(data)=>answer+=data);
-conn.write('require("baz")\nrequire("./baz")\n.exit\n');
-});
-
-process.on('exit',function(){
-assert.strictEqual(/Cannotfindmodule/.test(answer),false);
-assert.strictEqual(/Error/.test(answer),false);
-assert.strictEqual(answer,'\'eye catcher\'\n\'perhaps I work\'\n');
-});
+
+consthost=common.localhostIPv4;
+constport=0;
+constoptions={ host, port };
+
+letanswer='';
+server.listen(options,function(){
+options.port=this.address().port;
+constconn=net.connect(options);
+conn.setEncoding('utf8');
+conn.on('data',(data)=>answer+=data);
+conn.write('require("baz")\nrequire("./baz")\n.exit\n');
+});
+
+process.on('exit',function(){
+assert.strictEqual(/Cannotfindmodule/.test(answer),false);
+assert.strictEqual(/Error/.test(answer),false);
+assert.strictEqual(answer,'\'eye catcher\'\n\'perhaps I work\'\n');
+});
+}
+
+// Test for https://github.com/nodejs/node/issues/30808
+// In REPL, we shouldn't look up relative modules from 'node_modules'.
+{
+constserver=net.createServer((conn)=>{
+repl.start('',conn).on('exit',()=>{
+conn.destroy();
+server.close();
+});
+});
+
+consthost=common.localhostIPv4;
+constport=0;
+constoptions={ host, port };
+
+letanswer='';
+server.listen(options,function(){
+options.port=this.address().port;
+constconn=net.connect(options);
+conn.setEncoding('utf8');
+conn.on('data',(data)=>answer+=data);
+conn.write('require("./bar")\n.exit\n');
+});
+
+process.on('exit',function(){
+assert.strictEqual(/UncaughtError:Cannotfindmodule'\.\/bar'/.test(answer),true);
+
+assert.strictEqual(/code:'MODULE_NOT_FOUND'/.test(answer),true);
+assert.strictEqual(/requireStack:\['<repl>'\]/.test(answer),true);
+});
+}

test/parallel/test-require-resolve.js

@@ -23,6 +23,8 @@
 constcommon=require('../common');
 constfixtures=require('../common/fixtures');
 constassert=require('assert');
+const{ builtinModules }=require('module');
+constpath=require('path');
 
 assert.strictEqual(
 require.resolve(fixtures.path('a')).toLowerCase(),
@@ -52,3 +54,28 @@ const re = /^The "request" argument must be of type string\. Received type \w+$/
 message: re
 });
 });
+
+// Test require.resolve.paths.
+{
+// builtinModules.
+builtinModules.forEach((mod)=>{
+assert.strictEqual(require.resolve.paths(mod),null);
+});
+
+// node_modules.
+constresolvedPaths=require.resolve.paths('eslint');
+assert.strictEqual(Array.isArray(resolvedPaths),true);
+assert.strictEqual(resolvedPaths[0].includes('node_modules'),true);
+
+// relativeModules.
+constrelativeModules=['.','..','./foo','../bar'];
+relativeModules.forEach((mod)=>{
+constresolvedPaths=require.resolve.paths(mod);
+assert.strictEqual(Array.isArray(resolvedPaths),true);
+assert.strictEqual(resolvedPaths.length,1);
+assert.strictEqual(resolvedPaths[0],path.dirname(__filename));
+
+// Shouldn't look up relative modules from 'node_modules'.
+assert.strictEqual(resolvedPaths.includes('/node_modules'),false);
+});
+}