From 8e0cadb59215c831922292673a9dc2a5a44c8a9c Mon Sep 17 00:00:00 2001 From: Andrei Alecu Date: Fri, 7 Feb 2020 20:57:39 +0200 Subject: [PATCH 1/3] fix: use resolve package to find typescript --- src/util/importer.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/importer.ts b/src/util/importer.ts index e1c799b1db..121aceb889 100644 --- a/src/util/importer.ts +++ b/src/util/importer.ts @@ -1,3 +1,5 @@ +import * as resolve from 'resolve' + import { ModulePatcher, TBabelCore, TBabelJest, TTypeScript } from '../types' import { rootLogger } from './logger' @@ -174,7 +176,7 @@ function requireWrapper(moduleName: string): RequireResult { } const result: RequireResult = { exists, path, given: moduleName } try { - result.exports = requireModule(moduleName) + result.exports = requireModule(path) } catch (error) { result.error = error } @@ -182,7 +184,7 @@ function requireWrapper(moduleName: string): RequireResult { } let requireModule = (mod: string) => require(mod) -let resolveModule = (mod: string) => require.resolve(mod) +let resolveModule = (mod: string) => resolve.sync(mod, { basedir: process.cwd() }) /** * @internal From 026c555af4b87812e9251be79214665459f1d427 Mon Sep 17 00:00:00 2001 From: Andrei Alecu Date: Fri, 7 Feb 2020 22:11:56 +0200 Subject: [PATCH 2/3] fix: better fix --- src/util/importer.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/util/importer.ts b/src/util/importer.ts index 121aceb889..bbc8d8811e 100644 --- a/src/util/importer.ts +++ b/src/util/importer.ts @@ -1,5 +1,3 @@ -import * as resolve from 'resolve' - import { ModulePatcher, TBabelCore, TBabelJest, TTypeScript } from '../types' import { rootLogger } from './logger' @@ -184,7 +182,7 @@ function requireWrapper(moduleName: string): RequireResult { } let requireModule = (mod: string) => require(mod) -let resolveModule = (mod: string) => resolve.sync(mod, { basedir: process.cwd() }) +let resolveModule = (mod: string) => require.resolve(mod, { paths: [process.cwd(), __dirname] }) /** * @internal From 66999e24ee0282dfca7bae1f5cd19224e3e9dff7 Mon Sep 17 00:00:00 2001 From: Andrei Alecu Date: Fri, 7 Feb 2020 22:30:41 +0200 Subject: [PATCH 3/3] fix: tests --- src/util/importer.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/importer.ts b/src/util/importer.ts index bbc8d8811e..d5ee5bc0e5 100644 --- a/src/util/importer.ts +++ b/src/util/importer.ts @@ -176,7 +176,11 @@ function requireWrapper(moduleName: string): RequireResult { try { result.exports = requireModule(path) } catch (error) { - result.error = error + try { + result.exports = requireModule(moduleName) + } catch (error) { + result.error = error + } } return result }