fix(resolve): fix package.json vs exports lookups

vitejs · Dec 31, 2022 · 06e400a · 06e400a
1 parent 4f76054
commit 06e400a
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -654,37 +654,38 @@ export function tryNodeResolve(
     basedir = nestedResolveFrom(nestedRoot, basedir, preserveSymlinks)
   }
 
-  // nearest package.json
-  let nearestPkg: PackageData | undefined
-  // nearest package.json that may have the `exports` field
   let pkg: PackageData | undefined
 
   const rootPkgId = possiblePkgIds[0]
 
-  let pkgId = possiblePkgIds.reverse().find((pkgId) => {
-    nearestPkg = resolvePackageData(
-      pkgId,
-      basedir,
-      preserveSymlinks,
-      packageCache,
-    )!
-    return nearestPkg
-  })!
-
   const rootPkg = resolvePackageData(
     rootPkgId,
     basedir,
     preserveSymlinks,
     packageCache,
   )!
+
+  let pkgId: string
+
   if (rootPkg?.data?.exports) {
-    pkg = rootPkg
     pkgId = rootPkgId
+    pkg = rootPkg
   } else {
+    // nearest package.json
+    let nearestPkg: PackageData | undefined
+    pkgId = possiblePkgIds.reverse().find((pkgId) => {
+      nearestPkg = resolvePackageData(
+        pkgId,
+        basedir,
+        preserveSymlinks,
+        packageCache,
+      )!
+      return nearestPkg
+    })!
     pkg = nearestPkg
   }
 
-  if (!pkg || !nearestPkg) {
+  if (!pkg) {
     // if import can't be found, check if it's an optional peer dep.
     // if so, we can resolve to a special id that errors only when imported.
     if (