alternate fix

jestjs · Sep 4, 2019 · d9aaa1e · d9aaa1e
1 parent 7bf052d
commit d9aaa1e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/jest-resolve/src/defaultResolver.ts b/packages/jest-resolve/src/defaultResolver.ts
@@ -60,7 +60,10 @@ function resolveSync(
 
   if (REGEX_RELATIVE_IMPORT.test(target)) {
     // resolve relative import
-    const resolveTarget = path.resolve(basedir, target);
+    let resolveTarget = path.resolve(basedir, target);
+    if (target === '..' || target.endsWith('/')) {
+      resolveTarget += '/';
+    }
     const result = tryResolve(resolveTarget);
     if (result) {
       return result;
@@ -97,7 +100,7 @@ function resolveSync(
     const dir = path.dirname(name);
     let result;
     if (isDirectory(dir)) {
-      result = resolveAsDirectory(name) || resolveAsFile(name);
+      result = resolveAsFile(name) || resolveAsDirectory(name);
     }
     if (result) {
       // Dereference symlinks to ensure we don't create a separate