fix(vitest): correctly find module if it has a version query (#4976)

sheremet-va · web-flow · commit 952c31dfc470 · 2024-01-16T13:49:07.000+01:00
diff --git a/packages/vite-node/src/server.ts b/packages/vite-node/src/server.ts
@@ -195,6 +195,30 @@ export class ViteNodeServer {
     return 'web'
   }
 
+  private getChangedModule(
+    id: string,
+    file: string,
+  ) {
+    const module = this.server.moduleGraph.getModuleById(id) || this.server.moduleGraph.getModuleById(file)
+    if (module)
+      return module
+    const _modules = this.server.moduleGraph.getModulesByFile(file)
+    if (!_modules || !_modules.size)
+      return null
+    // find the latest changed module
+    const modules = [..._modules]
+    let mod = modules[0]
+    let latestMax = -1
+    for (const m of _modules) {
+      const timestamp = Math.max(m.lastHMRTimestamp, m.lastInvalidationTimestamp)
+      if (timestamp > latestMax) {
+        latestMax = timestamp
+        mod = m
+      }
+    }
+    return mod
+  }
+
   private async _fetchModule(id: string, transformMode: 'web' | 'ssr'): Promise<FetchResult> {
     let result: FetchResult
 
@@ -212,7 +236,7 @@ export class ViteNodeServer {
 
     const { path: filePath } = toFilePath(id, this.server.config.root)
 
-    const moduleNode = this.server.moduleGraph.getModuleById(id) || this.server.moduleGraph.getModuleById(filePath)
+    const moduleNode = this.getChangedModule(id, filePath)
     const cache = this.fetchCaches[transformMode].get(filePath)
 
     // lastUpdateTimestamp is the timestamp that marks the last time the module was changed
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
@@ -705,6 +705,12 @@ export class Vitest {
         this.changedTests.add(id)
         this.scheduleRerun([id])
       }
+      else {
+        // it's possible that file was already there but watcher triggered "add" event instead
+        const needsRerun = this.handleFileChanged(id)
+        if (needsRerun.length)
+          this.scheduleRerun(needsRerun)
+      }
     }
     const watcher = this.server.watcher
 

Original file line number	Diff line number	Diff line change
`@@ -705,6 +705,12 @@ export class Vitest {`
`705`	`705`	`this.changedTests.add(id)`
`706`	`706`	`this.scheduleRerun([id])`
`707`	`707`	`}`
	`708`	`+ else {`
	`709`	`+ // it's possible that file was already there but watcher triggered "add" event instead`
	`710`	`+ const needsRerun = this.handleFileChanged(id)`
	`711`	`+ if (needsRerun.length)`
	`712`	`+ this.scheduleRerun(needsRerun)`
	`713`	`+ }`
`708`	`714`	`}`
`709`	`715`	`const watcher = this.server.watcher`
`710`	`716`