From adf61d912296c4cda9f65dd0d5e62a3538f94b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Sun, 14 May 2023 01:43:33 +0900
Subject: [PATCH] fix: handle more yarn pnp load errors (#13160)

---
 packages/vite/src/node/packages.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/vite/src/node/packages.ts b/packages/vite/src/node/packages.ts
index c82367a48cca64..106631baff6a4d 100644
--- 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