◐ Shell
clean mode source ↗

module: remove duplicated checks from `_resolveFilename` · nodejs/node@13b7d08

Original file line numberDiff line numberDiff line change

@@ -1427,8 +1427,9 @@ Module._resolveFilename = function(request, parent, isMain, options) {

14271427

paths = Module._resolveLookupPaths(request, parent);

14281428

}

14291429
1430-

if (request[0] === '#' && (parent?.filename || parent?.id === '<repl>')) {

1431-

const parentPath = parent?.filename ?? process.cwd() + path.sep;

1430+

const parentPath = trySelfParentPath(parent);

1431+
1432+

if (request[0] === '#' && (parent.filename || parent.id === '<repl>')) {

14321433

const pkg = packageJsonReader.getNearestParentPackageJSON(parentPath);

14331434

if (pkg?.data.imports != null) {

14341435

try {

@@ -1448,7 +1449,6 @@ Module._resolveFilename = function(request, parent, isMain, options) {

14481449

}

14491450
14501451

// Try module self resolution first

1451-

const parentPath = trySelfParentPath(parent);

14521452

const selfResolved = trySelf(parentPath, request, conditions);

14531453

if (selfResolved) {

14541454

const cacheKey = request + '\x00' +