Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vite-node): always treat node_modules as modulesDirectory #3830

Merged
merged 2 commits into from Jul 28, 2023
Merged

fix(vite-node): always treat node_modules as modulesDirectory #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7278869
fix(vite-node): always treat node_modules as modulesDirectory
sheremet-va Jul 28, 2023
fd06bbd
chore: cleanup
sheremet-va Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/vite-node/src/server.ts
View file
Open in desktop
@@ -1,6 +1,6 @@
import { performance } from 'node:perf_hooks'
import { existsSync } from 'node:fs'
import { join, relative, resolve } from 'pathe'
import { join, normalize, relative, resolve } from 'pathe'
import type { TransformResult, ViteDevServer } from 'vite'
import createDebug from 'debug'
import type { EncodedSourceMap } from '@jridgewell/trace-mapping'
Expand Down Expand Up @@ -72,6 +72,18 @@ export class ViteNodeServer {
const customModuleDirectories = envValue?.split(',')
if (customModuleDirectories)
options.deps.moduleDirectories.push(...customModuleDirectories)

options.deps.moduleDirectories = options.deps.moduleDirectories.map((dir) => {
if (!dir.startsWith('/'))
dir = `/${dir}`
if (!dir.endsWith('/'))
dir += '/'
return normalize(dir)
})

// always add node_modules as a module directory
if (!options.deps.moduleDirectories.includes('/node_modules/'))
options.deps.moduleDirectories.push('/node_modules/')
}

shouldExternalize(id: string) {
Expand Down
4 changes: 3 additions & 1 deletion packages/vitest/src/node/config.ts
View file
Open in desktop
Expand Up @@ -140,14 +140,16 @@ export function resolveConfig(
resolved.deps.inline.push(...extraInlineDeps)
}
}
resolved.deps.moduleDirectories ??= ['/node_modules/']
resolved.deps.moduleDirectories ??= []
resolved.deps.moduleDirectories = resolved.deps.moduleDirectories.map((dir) => {
if (!dir.startsWith('/'))
dir = `/${dir}`
if (!dir.endsWith('/'))
dir += '/'
return normalize(dir)
})
if (!resolved.deps.moduleDirectories.includes('/node_modules/'))
resolved.deps.moduleDirectories.push('/node_modules/')

if (resolved.runner) {
resolved.runner = resolveModule(resolved.runner, { paths: [resolved.root] })
Expand Down