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): Prevent crash when passing single module as options #1406

Merged
merged 2 commits into from Jun 4, 2022
Merged

fix(vite-node): Prevent crash when passing single module as options #1406

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1465d8
fix(vite-node): Prevent crash when passing single module as options
antoinerey May 31, 2022
d218ee2
refactor: switch to toArray instead
antoinerey Jun 1, 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
28 changes: 22 additions & 6 deletions packages/vite-node/src/cli.ts
View file
Open in desktop
Expand Up @@ -89,16 +89,32 @@ async function run(files: string[], options: CliOptions = {}) {
}

function parseServerOptions(serverOptions: ViteNodeServerOptionsCLI): ViteNodeServerOptions {
const serverOptionsDepsInline = typeof serverOptions.deps?.inline === 'string'
? [serverOptions.deps?.inline]
: serverOptions.deps?.inline

const serverOptionsDepsExternal = typeof serverOptions.deps?.external === 'string'
? [serverOptions.deps?.external]
: serverOptions.deps?.external

const serverOptionsTransformModeSsr = typeof serverOptions.transformMode?.ssr === 'string'
? [serverOptions.transformMode?.ssr]
: serverOptions.transformMode?.ssr

const serverOptionsTransformModeWeb = typeof serverOptions.transformMode?.web === 'string'
? [serverOptions.transformMode?.web]
: serverOptions.transformMode?.web

return {
...serverOptions,
deps: {
...serverOptions.deps,
inline: serverOptions.deps?.inline?.map((dep) => {
inline: serverOptionsDepsInline?.map((dep) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may just use toArray (you can move it from vitest to vite-node)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in d218ee2. Much simpler indeed!

return dep.startsWith('/') && dep.endsWith('/')
? new RegExp(dep)
: dep
}),
external: serverOptions.deps?.external?.map((dep) => {
external: serverOptionsDepsExternal?.map((dep) => {
return dep.startsWith('/') && dep.endsWith('/')
? new RegExp(dep)
: dep
Expand All @@ -108,18 +124,18 @@ function parseServerOptions(serverOptions: ViteNodeServerOptionsCLI): ViteNodeSe
transformMode: {
...serverOptions.transformMode,

ssr: serverOptions.transformMode?.ssr?.map(dep => new RegExp(dep)),
web: serverOptions.transformMode?.ssr?.map(dep => new RegExp(dep)),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a mistake here. It should have been web instead. It's now fixed.

ssr: serverOptionsTransformModeSsr?.map(dep => new RegExp(dep)),
web: serverOptionsTransformModeWeb?.map(dep => new RegExp(dep)),
},
}
}

type Optional<T> = T | undefined
type ComputeViteNodeServerOptionsCLI<T extends Record<string, any>> = {
[K in keyof T]: T[K] extends Optional<RegExp[]>
? string[]
? string | string[]
: T[K] extends Optional<(string | RegExp)[]>
? string[]
? string | string[]
: T[K] extends Optional<Record<string, any>>
? ComputeViteNodeServerOptionsCLI<T[K]>
: T[K]
Expand Down