fix: build failing with Vite 3 (#1451)

vitest-dev · Jun 8, 2022 · 60eaee0 · 60eaee0
1 parent d8d5d33
commit 60eaee0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/vite-node/src/server.ts b/packages/vite-node/src/server.ts
@@ -25,7 +25,8 @@ export class ViteNodeServer {
     public server: ViteDevServer,
     public options: ViteNodeServerOptions = {},
   ) {
-    // @ts-expect-error ssr is not typed
+    // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+    // @ts-ignore ssr is not typed in Vite 2, but defined in Vite 3, so we can't use expect-error
     const ssrOptions = server.config.ssr
     if (ssrOptions) {
       options.deps ??= {}

diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
@@ -94,7 +94,8 @@ export function resolveConfig(
   // vitenode will try to import such file with native node,
   // but then our mocker will not work properly
   if (resolved.deps.inline !== true) {
-    // @ts-expect-error ssr is not typed
+    // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+    // @ts-ignore ssr is not typed in Vite 2, but defined in Vite 3, so we can't use expect-error
     const ssrOptions = viteConfig.ssr || {}
 
     if (ssrOptions.noExternal === true && resolved.deps.inline == null) {