test: simplify

Author: hi-ogawa

playground/ssr-react/__tests__/serve.ts

@@ -1,20 +1,19 @@
 import fetch from 'node-fetch'
 import { expect, test } from 'vitest'
-import { port } from './serve'
 import {
   browserLogs,
   editFile,
   isBuild,
   page,
   untilBrowserLogAfter,
   untilUpdated,
+  viteTestUrl as url,
 } from '~utils'
 
-const url = `http://localhost:${port}`
-
 test('/env', async () => {
-  await untilBrowserLogAfter(() => page.goto(url + '/env'), 'hydrated')
+  await untilBrowserLogAfter(() => page.goto(url + `/env`), 'hydrated')
 
+  await page.pause()
   expect(await page.textContent('h1')).toMatch('default message here')
 
   // raw http request

playground/ssr-react/__tests__/ssr-react.spec.ts

@@ -3,6 +3,8 @@ import react from '@vitejs/plugin-react'
 import fs from 'node:fs'
 import path from 'node:path'
 
+process.env.MY_CUSTOM_SECRET = 'API_KEY_qwertyuiop'
+
 export default defineConfig({
   appType: 'custom',
   build: {
@@ -72,4 +74,6 @@ export default defineConfig({
       },
     },
   ],
+  // tell vitestSetup.ts to use buildApp API
+  builder: {},
 })

playground/ssr-react/vite.config.js

@@ -14,6 +14,7 @@ import type {
 } from 'vite'
 import {
   build,
+  createBuilder,
   createServer,
   loadConfigFromFile,
   mergeConfig,
@@ -253,6 +254,7 @@ export async function startDefaultServe(): Promise<void> {
     viteTestUrl = `http://localhost:${server.config.server.port}${
       devBase === '/' ? '' : devBase
     }`
+    setViteUrl(viteTestUrl)
     await page.goto(viteTestUrl)
   } else {
     process.env.VITE_INLINE = 'inline-build'
@@ -267,12 +269,17 @@ export async function startDefaultServe(): Promise<void> {
     const testConfig = mergeConfig(options, config || {})
     viteConfig = testConfig
     process.chdir(rootDir)
-    const rollupOutput = await build(testConfig)
-    const isWatch = !!resolvedConfig!.build.watch
-    // in build watch,call startStaticServer after the build is complete
-    if (isWatch) {
-      watcher = rollupOutput as Rollup.RollupWatcher
-      await notifyRebuildComplete(watcher)
+    if (testConfig.builder) {
+      const builder = await createBuilder(testConfig)
+      await builder.buildApp()
+    } else {
+      const rollupOutput = await build(testConfig)
+      const isWatch = !!resolvedConfig!.build.watch
+      // in build watch,call startStaticServer after the build is complete
+      if (isWatch) {
+        watcher = rollupOutput as Rollup.RollupWatcher
+        await notifyRebuildComplete(watcher)
+      }
     }
     // @ts-ignore
     if (config && config.__test__) {
@@ -284,6 +291,8 @@ export async function startDefaultServe(): Promise<void> {
     // prevent preview change NODE_ENV
     process.env.NODE_ENV = _nodeEnv
     viteTestUrl = previewServer.resolvedUrls.local[0]
+    viteTestUrl = viteTestUrl.replace(/\/+$/, '')
+    setViteUrl(viteTestUrl)
     await page.goto(viteTestUrl)
   }
 }