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): normalize relative paths to be from current working directory #952

Merged
merged 7 commits into from
Mar 16, 2022
Merged

fix(vite-node): normalize relative paths to be from current working directory #952

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7d0db3
fix: Import with absolute paths
kalvenschraut Mar 15, 2022
e24e9f4
test: Added test case
kalvenschraut Mar 15, 2022
6f10ede
fix: Move inside previous if
kalvenschraut Mar 15, 2022
d910208
fix: Cleanup test
kalvenschraut Mar 15, 2022
6ff56c3
fix: Test typing
kalvenschraut Mar 15, 2022
4e31d15
fix: Test wording
kalvenschraut Mar 15, 2022
2c4ff7c
fix(resolveId): Update importer if it isn't from the root
kalvenschraut Mar 16, 2022
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
5 changes: 4 additions & 1 deletion packages/vite-node/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createRequire } from 'module'
import { fileURLToPath, pathToFileURL } from 'url'
import vm from 'vm'
import { dirname, extname, isAbsolute, resolve } from 'pathe'
import { dirname, extname, isAbsolute, normalize, resolve } from 'pathe'
import { isNodeBuiltin } from 'mlly'
import { isPrimitive, normalizeId, slash, toFilePath } from './utils'
import type { ModuleCache, ViteNodeRunnerOptions } from './types'
Expand Down Expand Up @@ -59,6 +59,9 @@ export class ViteNodeRunner {
const resolvedDep = await this.options.resolveId(dep, id)
dep = resolvedDep?.id?.replace(this.root, '') || dep
}
if (!isAbsolute(dep) && extname(dep))
dep = normalize(`${dirname(id)}/${dep}`)
sheremet-va marked this conversation as resolved.
Show resolved Hide resolved

if (callstack.includes(dep)) {
if (!this.moduleCache.get(dep)?.exports)
throw new Error(`[vite-node] Circular dependency detected\nStack:\n${[...callstack, dep].reverse().map(p => `- ${p}`).join('\n')}`)
Expand Down