Skip to content

Commit 6b7e868

Browse files
authored
Merge pull request #449 from cloudinary/fix/jest-resolver
2 parents eb64e45 + 24523de commit 6b7e868

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed
Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,15 @@
1-
let defaultResolver;
2-
31
/**
4-
*
5-
* @return {(path: Config.Path, options: ResolverOptions) => Config.Path}
2+
* Jest can’t find files with a .js extension. We use this resolver to catch that error and replace the files with a
3+
* .ts extension.
64
*/
7-
async function requireDefaultResolver() {
8-
if (!defaultResolver) {
9-
try {
10-
defaultResolver = await import(`jest-resolve/build/defaultResolver`).default;
11-
} catch (error) {
12-
defaultResolver = await import(`jest-resolve/build/default_resolver`).default;
13-
}
14-
}
15-
16-
return defaultResolver;
17-
}
18-
19-
205
module.exports = (request, options) => {
21-
let {basedir, defaultResolver, extensions} = options;
22-
23-
if (!defaultResolver) {
24-
defaultResolver = requireDefaultResolver();
25-
}
6+
// Jest's default resolver
7+
const {defaultResolver} = options;
268

279
try {
2810
return defaultResolver(request, options);
11+
// if default resolver fails we replace file extension from .js to .ts
2912
} catch (e) {
3013
return defaultResolver(request.replace(/\.js$/, '.ts'), options);
3114
}
32-
}
15+
};

0 commit comments

Comments
 (0)