fix: require files relative to the source file

kentcdodds · Sep 21, 2018 · 1785a0f · Andarist · Nov 10, 2018 · kentcdodds
1 parent 134f7f6
commit 1785a0f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -28,7 +28,8 @@
   "author": "Kent C. Dodds <[email protected]> (http://kentcdodds.com/)",
   "license": "MIT",
   "dependencies": {
-    "cosmiconfig": "^5.0.5"
+    "cosmiconfig": "^5.0.5",
+    "resolve": "^1.8.1"
   },
   "devDependencies": {
     "@babel/core": "^7.1.0",

diff --git a/src/__tests__/__snapshots__/index.js.snap b/src/__tests__/__snapshots__/index.js.snap
@@ -149,7 +149,7 @@ export default 'something else'
 
       ↓ ↓ ↓ ↓ ↓ ↓
 
-Error: Cannot find module '<PROJECT_ROOT>/src/__tests__/some-macros-that-doesnt-even-need-to-exist.macro' from 'index.js'
+Error: Cannot find module './some-macros-that-doesnt-even-need-to-exist.macro' from '<PROJECT_ROOT>/src/__tests__'
 
 `;
 

diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,5 @@
 const p = require('path')
+const resolve = require('resolve')
 // const printAST = require('ast-pretty-print')
 
 const macrosRegex = /[./]macro(\.js)?$/
@@ -149,11 +150,10 @@ function applyMacros({path, imports, source, state, babel, interopRequire}) {
     {},
   )
 
-  let requirePath = source
   const isRelative = source.indexOf('.') === 0
-  if (isRelative) {
-    requirePath = p.join(p.dirname(getFullFilename(filename)), source)
-  }
+  const requirePath = resolve.sync(source, {
+    basedir: p.dirname(getFullFilename(filename)),
+  })
 
   const macro = interopRequire(requirePath)
   if (!macro.isBabelMacro) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,7 +149,7 @@ export default 'something else' @@
           ↓ ↓ ↓ ↓ ↓ ↓
-    Error: Cannot find module '<PROJECT_ROOT>/src/__tests__/some-macros-that-doesnt-even-need-to-exist.macro' from 'index.js'
+    Error: Cannot find module './some-macros-that-doesnt-even-need-to-exist.macro' from '<PROJECT_ROOT>/src/__tests__'
     `;
@@ Expand Down @@