@@ -307,6 +307,27 @@ export function resolveConfig(
307307 resolved . deps . web . transformCss ??= true
308308 resolved . deps . web . transformGlobPattern ??= [ ]
309309
310+ resolved . setupFiles = toArray ( resolved . setupFiles || [ ] ) . map ( file =>
311+ resolvePath ( file , resolved . root ) ,
312+ )
313+ resolved . globalSetup = toArray ( resolved . globalSetup || [ ] ) . map ( file =>
314+ resolvePath ( file , resolved . root ) ,
315+ )
316+ resolved . coverage . exclude . push (
317+ ...resolved . setupFiles . map (
318+ file =>
319+ `${ resolved . coverage . allowExternal ? '**/' : '' } ${ relative (
320+ resolved . root ,
321+ file ,
322+ ) } `,
323+ ) ,
324+ )
325+
326+ resolved . forceRerunTriggers = [
327+ ...resolved . forceRerunTriggers ,
328+ ...resolved . setupFiles ,
329+ ]
330+
310331 resolved . server ??= { }
311332 resolved . server . deps ??= { }
312333
@@ -366,6 +387,8 @@ export function resolveConfig(
366387 }
367388 }
368389
390+ resolved . server . deps . inlineFiles ??= [ ]
391+ resolved . server . deps . inlineFiles . push ( ...resolved . setupFiles )
369392 resolved . server . deps . moduleDirectories ??= [ ]
370393 resolved . server . deps . moduleDirectories . push (
371394 ...resolved . deps . moduleDirectories ,
@@ -554,27 +577,6 @@ export function resolveConfig(
554577 }
555578 }
556579
557- resolved . setupFiles = toArray ( resolved . setupFiles || [ ] ) . map ( file =>
558- resolvePath ( file , resolved . root ) ,
559- )
560- resolved . globalSetup = toArray ( resolved . globalSetup || [ ] ) . map ( file =>
561- resolvePath ( file , resolved . root ) ,
562- )
563- resolved . coverage . exclude . push (
564- ...resolved . setupFiles . map (
565- file =>
566- `${ resolved . coverage . allowExternal ? '**/' : '' } ${ relative (
567- resolved . root ,
568- file ,
569- ) } `,
570- ) ,
571- )
572-
573- resolved . forceRerunTriggers = [
574- ...resolved . forceRerunTriggers ,
575- ...resolved . setupFiles ,
576- ]
577-
578580 if ( resolved . diff ) {
579581 resolved . diff = resolvePath ( resolved . diff , resolved . root )
580582 resolved . forceRerunTriggers . push ( resolved . diff )
0 commit comments