From d2460b7a204e83a5ce97b780fdeddcddbc25e6da Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Sat, 25 Feb 2023 10:23:45 +0100
Subject: [PATCH] fix: wait for optimized dependency to be bundled in non-pnpm
 package managers

---
 packages/vite-node/src/server.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/vite-node/src/server.ts b/packages/vite-node/src/server.ts
index d9de1be8537e..85f48282370f 100644
--- a/packages/vite-node/src/server.ts
+++ b/packages/vite-node/src/server.ts
@@ -150,8 +150,9 @@ export class ViteNodeServer {
 
     const cacheDir = this.options.deps?.cacheDir
 
-    if (cacheDir && id.includes(cacheDir) && !id.includes(this.server.config.root)) {
-      id = join(this.server.config.root, id)
+    if (cacheDir && id.includes(cacheDir)) {
+      if (!id.startsWith(this.server.config.root))
+        id = join(this.server.config.root, id)
       const timeout = setTimeout(() => {
         throw new Error(`ViteNodeServer: ${id} not found. This is a bug, please report it.`)
       }, 5000) // CI can be quite slow