module: also enable subpath imports in REPL

nodejs · Jun 18, 2022 · 5521da2 · 5521da2
1 parent 61c7103
commit 5521da2
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -906,20 +906,19 @@ Module._resolveFilename = function(request, parent, isMain, options) {
     paths = Module._resolveLookupPaths(request, parent);
   }
 
-  if (parent?.filename) {
-    if (request[0] === '#') {
-      const pkg = readPackageScope(parent.filename) || {};
-      if (pkg.data?.imports != null) {
-        try {
-          return finalizeEsmResolution(
-            packageImportsResolve(request, pathToFileURL(parent.filename),
-                                  cjsConditions), parent.filename,
-            pkg.path);
-        } catch (e) {
-          if (e.code === 'ERR_MODULE_NOT_FOUND')
-            throw createEsmNotFoundErr(request);
-          throw e;
-        }
+  if (request[0] === '#' && (parent?.filename || parent?.id === '<repl>')) {
+    const parentPath = parent?.filename ?? process.cwd() + path.sep;
+    const pkg = readPackageScope(parentPath) || {};
+    if (pkg.data?.imports != null) {
+      try {
+        return finalizeEsmResolution(
+          packageImportsResolve(request, pathToFileURL(parentPath),
+                                cjsConditions), parentPath,
+          pkg.path);
+      } catch (e) {
+        if (e.code === 'ERR_MODULE_NOT_FOUND')
+          throw createEsmNotFoundErr(request);
+        throw e;
       }
     }
   }