use esmockResolver

iambumblehead · Oct 14, 2023 · 69b3343 · 69b3343
1 parent b948324
commit 69b3343
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/esmockModule.js b/src/esmockModule.js
@@ -2,6 +2,7 @@ import fs from 'fs'
 import resolvewith from 'resolvewithplus'
 import esmockErr from './esmockErr.js'
 import esmockIsESMRe from './esmockIsESMRe.js'
+import esmockResolver from './esmockResolver.js'
 
 import {
   esmockTreeIdSet,
@@ -116,7 +117,8 @@ const esmockModuleId = async (parent, treeid, defs, ids, opt, mocks, id) => {
 
   if (!id) return mocks
 
-  const fileURL = opt.resolver(id, parent)
+  const resolver = await esmockResolver(opt)
+  const fileURL = resolver(id, parent)
   if (!fileURL && opt.isModuleNotFoundError !== false && id !== 'import')
     throw esmockErr.errModuleIdNotFound(id, parent)
 
@@ -126,7 +128,8 @@ const esmockModuleId = async (parent, treeid, defs, ids, opt, mocks, id) => {
 }
 
 const esmockModule = async (moduleId, parent, defs, gdefs, opt) => {
-  const moduleFileURL = opt.resolver(moduleId, parent)
+  const resolver = await esmockResolver(opt)
+  const moduleFileURL = resolver(moduleId, parent)
   if (!moduleFileURL)
     throw esmockErr.errModuleIdNotFound(moduleId, parent)
 

diff --git a/src/esmockReslover.js → src/esmockResolver.js b/src/esmockReslover.js → src/esmockResolver.js