perf(resolve): fix browser mapping nearest package.json check (#12550)

vitejs · Mar 23, 2023 · eac376e · eac376e
1 parent 3f70f47
commit eac376e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -827,8 +827,8 @@ export function tryNodeResolve(
       !(
         ext === '.cjs' ||
         (ext === '.js' &&
-          findNearestPackageData(resolved, options.packageCache)?.data.type !==
-            'module')
+          findNearestPackageData(path.dirname(resolved), options.packageCache)
+            ?.data.type !== 'module')
       ) &&
       !(include?.includes(pkgId) || include?.includes(id)))
 
@@ -1206,7 +1206,7 @@ function tryResolveBrowserMapping(
   const pkg =
     importer &&
     (idToPkgMap.get(importer) ||
-      findNearestPackageData(importer, options.packageCache))
+      findNearestPackageData(path.dirname(importer), options.packageCache))
   if (pkg && isObject(pkg.data.browser)) {
     const mapId = isFilePath ? './' + slash(path.relative(pkg.dir, id)) : id
     const browserMappedPath = mapWithBrowserField(mapId, pkg.data.browser)