fix: handle more yarn pnp load errors (#13160)

vitejs · May 13, 2023 · adf61d9 · adf61d9
1 parent ee80aba
commit adf61d9
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/packages/vite/src/node/packages.ts b/packages/vite/src/node/packages.ts
@@ -58,20 +58,18 @@ export function resolvePackageData(
     const cacheKey = getRpdCacheKey(pkgName, basedir, preserveSymlinks)
     if (packageCache?.has(cacheKey)) return packageCache.get(cacheKey)!
 
-    let pkg: string | null
     try {
-      pkg = pnp.resolveToUnqualified(pkgName, basedir, {
+      const pkg = pnp.resolveToUnqualified(pkgName, basedir, {
         considerBuiltins: false,
       })
+      if (!pkg) return null
+
+      const pkgData = loadPackageData(path.join(pkg, 'package.json'))
+      packageCache?.set(cacheKey, pkgData)
+      return pkgData
     } catch {
       return null
     }
-    if (!pkg) return null
-
-    const pkgData = loadPackageData(path.join(pkg, 'package.json'))
-    packageCache?.set(cacheKey, pkgData)
-
-    return pkgData
   }
 
   const originalBasedir = basedir