From a63808cb774402c157e9bbb6bf5cc849aa5b9b9e Mon Sep 17 00:00:00 2001
From: Andrei Alecu <andreialecu@users.noreply.github.com>
Date: Sat, 8 Feb 2020 12:33:13 +0200
Subject: [PATCH] fix(util): use resolve package typescript package in yarn
 workspaces (#1377)

---
 src/util/importer.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/util/importer.ts b/src/util/importer.ts
index e1c799b1db..d5ee5bc0e5 100644
--- a/src/util/importer.ts
+++ b/src/util/importer.ts
@@ -174,15 +174,19 @@ 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
+    try {
+      result.exports = requireModule(moduleName)
+    } catch (error) {
+      result.error = error
+    }
   }
   return result
 }
 
 let requireModule = (mod: string) => require(mod)
-let resolveModule = (mod: string) => require.resolve(mod)
+let resolveModule = (mod: string) => require.resolve(mod, { paths: [process.cwd(), __dirname] })
 
 /**
  * @internal