test: hacky setupFiles

packages/vite/src/node/__tests__/build.spec.ts

@@ -4,8 +4,8 @@ import colors from 'picocolors'
 import { describe, expect, test, vi } from 'vitest'
 import type { OutputChunk, OutputOptions, RollupOutput } from 'rollup'
 import type { LibraryFormats, LibraryOptions } from '../build'
-import { build } from '..'
 import {
+  build,
   createBuilder,
   resolveBuildOutputs,
   resolveLibFilename,

packages/vite/src/node/__tests__/environment.spec.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { describe, expect, onTestFinished, test } from 'vitest'
 import type { RollupOutput } from 'rollup'
-import { createServer } from '..'
+import { createServer } from '../server'
 import type { InlineConfig } from '../config'
 import { createBuilder } from '../build'
 import { createServerModuleRunner } from '../ssr/runtime/serverModuleRunner'

packages/vite/src/node/__tests__/plugins/assetImportMetaUrl.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest'
 import { parseAst } from 'rollup/parseAst'
-import { resolveConfig } from '../..'
 import { assetImportMetaUrlPlugin } from '../../plugins/assetImportMetaUrl'
+import { resolveConfig } from '../../config'
 import { PartialEnvironment } from '../../baseEnvironment'
 
 async function createAssetImportMetaurlPluginTransform() {

packages/vite/src/node/__tests__/plugins/define.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
-import { resolveConfig } from '../..'
 import { definePlugin } from '../../plugins/define'
+import { resolveConfig } from '../../config'
 import { PartialEnvironment } from '../../baseEnvironment'
 
 async function createDefinePluginTransform(

packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.spec.ts

@@ -1,8 +1,8 @@
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { normalizePath } from '../../..'
 import { transformDynamicImport } from '../../../plugins/dynamicImportVars'
+import { normalizePath } from '../../../utils'
 import { isWindows } from '../../../../shared/utils'
 
 const __dirname = resolve(fileURLToPath(import.meta.url), '..')

packages/vite/src/node/__tests__/plugins/import.spec.ts

@@ -1,5 +1,4 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest'
-import '../..' // fix cyclic import error
 import { transformCjsImport } from '../../plugins/importAnalysis'
 
 describe('transformCjsImport', () => {

packages/vite/src/node/__tests__/plugins/modulePreloadPolyfill/modulePreloadPolyfill.spec.ts

@@ -1,6 +1,6 @@
 import { describe, it } from 'vitest'
 import type { ModuleFormat, RollupOutput } from 'rollup'
-import { build } from '../../..'
+import { build } from '../../../build'
 import { modulePreloadPolyfillId } from '../../../plugins/modulePreloadPolyfill'
 
 const buildProject = ({ format = 'es' as ModuleFormat } = {}) =>

packages/vite/src/node/__tests__/resolve.spec.ts

@@ -1,6 +1,6 @@
 import { join } from 'node:path'
 import { describe, expect, onTestFinished, test } from 'vitest'
-import { createServer } from '..'
+import { createServer } from '../server'
 import { createServerModuleRunner } from '../ssr/runtime/serverModuleRunner'
 import type { InlineConfig } from '../config'
 import { build } from '../build'

packages/vite/src/node/__tests__/scan.spec.ts

@@ -1,5 +1,4 @@
 import { describe, expect, test } from 'vitest'
-import '..' // fix cyclic import error
 import { commentRE, importsRE, scriptRE } from '../optimizer/scan'
 import { multilineCommentsRE, singlelineCommentsRE } from '../utils'
 

packages/vite/src/node/server/__tests__/moduleGraph.spec.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from 'vitest'
-import '../..' // fix cyclic import error
 import { EnvironmentModuleGraph } from '../moduleGraph'
 import type { ModuleNode } from '../mixedModuleGraph'
 import { ModuleGraph } from '../mixedModuleGraph'

packages/vite/src/node/server/__tests__/watcher.spec.ts

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { type ViteDevServer, createServer } from '../..'
+import { type ViteDevServer, createServer } from '../index'
 
 const stubGetWatchedCode = /\(\)\s*\{\s*return this;\s*\}/
 

packages/vite/src/node/ssr/__tests__/ssrLoadModule.spec.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 import fs from 'node:fs'
 import { stripVTControlCharacters } from 'node:util'
 import { expect, test } from 'vitest'
-import { createServer } from '../..'
+import { createServer } from '../../server'
 import { normalizePath } from '../../utils'
 
 const root = fileURLToPath(new URL('./', import.meta.url))

packages/vite/src/node/ssr/__tests__/ssrStacktrace.spec.ts

@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import { test } from 'vitest'
-import { createServer } from '../..'
+import { createServer } from '../../server'
 
 const root = fileURLToPath(new URL('./', import.meta.url))
 

vitest.config.ts

@@ -15,6 +15,10 @@ export default defineConfig({
     ],
     testTimeout: 20000,
     isolate: false,
+    // importing non entry files (e.g. config.ts, build.ts, server/index.ts) is broken due to cyclic import
+    // as it can be seen from tsx (try pnpm exec tsx packages/vite/src/node/server/index.ts).
+    // we can use `setupFiles` to ensure the modules are evaluated via main node entry.
+    setupFiles: ['./packages/vite/src/node/index.ts'],
   },
   esbuild: {
     target: 'node18',