Merge branch 'main' into fix-eco-ci-6

packages/vitest/src/node/pools/rpc.ts

@@ -110,7 +110,10 @@ export function createMethodsRPC(project: WorkspaceProject, options: MethodsOpti
 
 // serialize rollup error on server to preserve details as a test error
 function handleRollupError(e: unknown): never {
-  if (e instanceof Error && 'plugin' in e) {
+  if (
+    e instanceof Error
+    && ('plugin' in e || 'frame' in e || 'id' in e)
+  ) {
     // eslint-disable-next-line no-throw-literal
     throw {
       name: e.name,

packages/vitest/src/node/stdin.ts

@@ -149,6 +149,11 @@ export function registerConsoleShortcuts(
     })
 
     on()
+
+    if (typeof filter === 'undefined') {
+      return
+    }
+
     const files = ctx.state.getFilepaths()
     // if running in standalone mode, Vitest instance doesn't know about any test file
     const cliFiles
@@ -193,6 +198,10 @@ export function registerConsoleShortcuts(
 
     on()
 
+    if (typeof filter === 'undefined') {
+      return
+    }
+
     latestFilename = filter?.trim() || ''
     const lastResults = watchFilter.getLastResults()
 

packages/vitest/src/node/watch-filter.ts

@@ -74,9 +74,9 @@ export class WatchFilter {
           break
         case key?.ctrl && key?.name === 'c':
         case key?.name === 'escape':
-          this.cancel()
+          this.write(`${ESC}1G${ESC}0J`) // clean content
           onSubmit(undefined)
-          break
+          return
         case key?.name === 'enter':
         case key?.name === 'return':
           onSubmit(
@@ -224,10 +224,6 @@ export class WatchFilter {
     this.write(`${ESC}${cursortPos}G`)
   }
 
-  private cancel() {
-    this.write(`${ESC}J`) // erase down
-  }
-
   private write(data: string) {
     // @ts-expect-error -- write() method has different signature on the union type
     this.stdout.write(data)