From 2dafae0f84ae5d4c13a26b6392137c939504c829 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Fri, 27 Sep 2024 15:09:44 +0900
Subject: [PATCH] fix: move 'vitest:ui' too

---
 packages/ui/node/index.ts | 61 ++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/ui/node/index.ts b/packages/ui/node/index.ts
index ef2a3fe8598c..bd2eb8a2b28a 100644
--- a/packages/ui/node/index.ts
+++ b/packages/ui/node/index.ts
@@ -22,41 +22,44 @@ export default (ctx: Vitest): Plugin => {
   return <Plugin>{
     name: 'vitest:ui',
     apply: 'serve',
-    configureServer(server) {
-      const uiOptions = ctx.config
-      const base = uiOptions.uiBase
-      const coverageFolder = resolveCoverageFolder(ctx)
-      const coveragePath = coverageFolder ? coverageFolder[1] : undefined
-      if (coveragePath && base === coveragePath) {
-        throw new Error(
-          `The ui base path and the coverage path cannot be the same: ${base}, change coverage.reportsDirectory`,
-        )
-      }
+    configureServer: {
+      order: 'post',
+      handler(server) {
+        const uiOptions = ctx.config
+        const base = uiOptions.uiBase
+        const coverageFolder = resolveCoverageFolder(ctx)
+        const coveragePath = coverageFolder ? coverageFolder[1] : undefined
+        if (coveragePath && base === coveragePath) {
+          throw new Error(
+            `The ui base path and the coverage path cannot be the same: ${base}, change coverage.reportsDirectory`,
+          )
+        }
 
-      if (coverageFolder) {
+        if (coverageFolder) {
+          server.middlewares.use(
+            coveragePath!,
+            sirv(coverageFolder[0], {
+              single: true,
+              dev: true,
+              setHeaders: (res) => {
+                res.setHeader(
+                  'Cache-Control',
+                  'public,max-age=0,must-revalidate',
+                )
+              },
+            }),
+          )
+        }
+
+        const clientDist = resolve(fileURLToPath(import.meta.url), '../client')
         server.middlewares.use(
-          coveragePath!,
-          sirv(coverageFolder[0], {
+          base,
+          sirv(clientDist, {
             single: true,
             dev: true,
-            setHeaders: (res) => {
-              res.setHeader(
-                'Cache-Control',
-                'public,max-age=0,must-revalidate',
-              )
-            },
           }),
         )
-      }
-
-      const clientDist = resolve(fileURLToPath(import.meta.url), '../client')
-      server.middlewares.use(
-        base,
-        sirv(clientDist, {
-          single: true,
-          dev: true,
-        }),
-      )
+      },
     },
   }
 }