fix: use baseUrl when resolving paths arrays

aleclarson · Nov 30, 2022 · 9fcd4b8 · 9fcd4b8
1 parent c9b2655
commit 9fcd4b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -125,7 +125,10 @@ export default (opts: PluginOptions = {}): Plugin => {
 
     let resolveId: Resolver
     if (paths) {
-      const pathMappings = resolvePathMappings(paths, dirname(configPath))
+      const pathMappings = resolvePathMappings(
+        paths,
+        options.baseUrl ?? dirname(configPath)
+      )
       const resolveWithPaths: Resolver = async (viteResolve, id, importer) => {
         for (const mapping of pathMappings) {
           const match = id.match(mapping.pattern)

diff --git a/src/mappings.ts b/src/mappings.ts
@@ -7,7 +7,7 @@ export type PathMapping = {
 
 export function resolvePathMappings(
   paths: Record<string, string[]>,
-  root: string
+  base: string
 ) {
   // If a module name can be matched with multiple patterns then pattern
   // with the longest prefix will be picked.
@@ -20,7 +20,7 @@ export function resolvePathMappings(
     pattern = escapeStringRegexp(pattern).replace(/\*/g, '(.+)')
     resolved.push({
       pattern: new RegExp('^' + pattern + '$'),
-      paths: relativePaths.map((relativePath) => resolve(root, relativePath)),
+      paths: relativePaths.map((relativePath) => resolve(base, relativePath)),
     })
   }
   return resolved