revert: "fix(vite-node): circular import stuck" vitest-dev#3418 (vitest-dev#3479)

sheremet-va · web-flow · commit 03d34249acbf · 2023-05-31T16:18:08.000+02:00
diff --git a/examples/mocks/src/main.js b/examples/mocks/src/main.js
@@ -1,10 +1,5 @@
 import { funcA } from './A'
-import { funcB } from './B'
 
 export function main() {
   return funcA()
 }
-
-export function mainB() {
-  return funcB()
-}
diff --git a/examples/mocks/test/circular.spec.ts b/examples/mocks/test/circular.spec.ts
@@ -1,27 +1,18 @@
 import { expect, test, vi } from 'vitest'
-import { main, mainB } from '../src/main.js'
+import { main } from '../src/main.js'
 import x from '../src/export-default-circle-index'
 
 vi.mock('../src/A', async () => ({
   ...(await vi.importActual<any>('../src/A')),
   funcA: () => 'mockedA',
 }))
 
-vi.mock('../src/B', async () => ({
-  ...(await vi.importActual<any>('../src/B')),
-  funcB: () => 'mockedB',
-}))
-
 vi.mock('../src/export-default-circle-b')
 
 test('can import actual inside mock factory', () => {
   expect(main()).toBe('mockedA')
 })
 
-test('can import in top level and inside mock factory', () => {
-  expect(mainB()).toBe('mockedB')
-})
-
 test('can mock a circular dependency', () => {
   expect(x()).toBe(undefined)
 })
diff --git a/packages/vite-node/src/client.ts b/packages/vite-node/src/client.ts
@@ -194,7 +194,7 @@ export class ViteNodeRunner {
     const getStack = () => `stack:\n${[...callstack, fsPath].reverse().map(p => `  - ${p}`).join('\n')}`
 
     // check circular dependency
-    if (callstack.includes(fsPath) || callstack.some(c => this.moduleCache.get(c).importers?.has(fsPath)) || mod.importers.has(importee)) {
+    if (callstack.includes(fsPath) || callstack.some(c => this.moduleCache.get(c).importers?.has(fsPath))) {
       if (mod.exports)
         return mod.exports
     }

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ export class ViteNodeRunner {`
`194`	`194`	const getStack = () => `stack:\n${[...callstack, fsPath].reverse().map(p => ` - ${p}`).join('\n')}`
`195`	`195`
`196`	`196`	`// check circular dependency`
`197`		`- if (callstack.includes(fsPath) \|\| callstack.some(c => this.moduleCache.get(c).importers?.has(fsPath)) \|\| mod.importers.has(importee)) {`
	`197`	`+ if (callstack.includes(fsPath) \|\| callstack.some(c => this.moduleCache.get(c).importers?.has(fsPath))) {`
`198`	`198`	`if (mod.exports)`
`199`	`199`	`return mod.exports`
`200`	`200`	`}`