From f769932d7b5766a2455970fb69da796055c69872 Mon Sep 17 00:00:00 2001
From: Patrick Pircher <patricklx@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:13:34 +0200
Subject: [PATCH] fix

---
 packages/vite/src/esbuild-resolver.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/esbuild-resolver.ts b/packages/vite/src/esbuild-resolver.ts
index 16b074e51..c01bb8f12 100644
--- a/packages/vite/src/esbuild-resolver.ts
+++ b/packages/vite/src/esbuild-resolver.ts
@@ -61,7 +61,7 @@ export function esBuildResolver(extensions: string[]): EsBuildPlugin {
             let fromPkg = pkgCache.ownerOfFile(request.fromFile);
             let toPkg = pkgCache.ownerOfFile(resolution.result.path!);
             let fromAppFile = fromPkg && resolverLoader.resolver.reverseSearchAppTree(fromPkg, request.fromFile);
-            let toAppFile = toPkg && resolverLoader.resolver.reverseSearchAppTree(toPkg, resolution.resolution.path);
+            let toAppFile = toPkg && resolverLoader.resolver.reverseSearchAppTree(toPkg, resolution.result.path!);
             if (toAppFile) {
               if (!fromAppFile) {
                 let encoded = resolverLoader.resolver.generateEncodedRequest(request);
@@ -74,6 +74,7 @@ export function esBuildResolver(extensions: string[]): EsBuildPlugin {
               }
             }
             if (toPkg?.isV2addon() && fromAppFile && !toAppFile) {
+              let encoded = resolverLoader.resolver.generateEncodedRequest(request);
               return {
                 path: encoded.specifier,
                 external: true,