refactor: better fix

vitejs · Jul 23, 2024 · 052a18c · 052a18c
1 parent 48a3fd0
commit 052a18c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts
@@ -563,12 +563,7 @@ export async function toAbsoluteGlob(
       custom: { 'vite:import-glob': { isSubImportsPattern } },
     })) || glob,
   )
-  // If matching a subpath import, the returned path is relative and doesn't look absolute.
-  // If it matches an alias that starts with `#`, the path will be absolute.
-  if (isSubImportsPattern && !isAbsolute(resolved)) {
-    return join(root, resolved)
-  }
-  if (isSubImportsPattern || isAbsolute(resolved)) {
+  if (isAbsolute(resolved)) {
     return pre + globSafeResolvedPath(resolved, glob)
   }
 

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -203,7 +203,7 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
         id = resolvedImports
 
         if (resolveOpts.custom?.['vite:import-glob']?.isSubImportsPattern) {
-          return id
+          return normalizePath(path.join(root, id))
         }
       }