perf(e2e): use tinyexec to run commands (#939)

nuxt · Sep 10, 2024 · 4bd549f · 4bd549f
1 parent e1a8ef9
commit 4bd549f
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 38 deletions.
diff --git a/examples/app-jest/test/browser.e2e.spec.ts b/examples/app-jest/test/browser.e2e.spec.ts
@@ -1,5 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import { createPage, setup } from '@nuxt/test-utils/e2e'
+import { isWindows } from 'std-env'
 
 await setup({
   rootDir: fileURLToPath(new URL('../', import.meta.url)),
@@ -12,5 +13,5 @@ describe('browser', () => {
     const text = await page.getByRole('heading', { name: 'Welcome to Nuxt!' }).textContent()
     expect(text).toContain('Welcome to Nuxt!')
     await page.close()
-  }, 10000)
+  }, isWindows ? 60000 : 10000)
 })
diff --git a/examples/app-vitest/test/browser.e2e.spec.ts b/examples/app-vitest/test/browser.e2e.spec.ts
@@ -1,6 +1,7 @@
 import { fileURLToPath } from 'node:url'
 import { createPage, setup } from '@nuxt/test-utils/e2e'
 import { describe, expect, it } from 'vitest'
+import { isWindows } from 'std-env'
 
 await setup({
   rootDir: fileURLToPath(new URL('../', import.meta.url)),
@@ -13,5 +14,5 @@ describe('browser', () => {
     const text = await page.getByRole('heading', { name: 'Welcome to Nuxt!' }).textContent()
     expect(text).toContain('Welcome to Nuxt!')
     await page.close()
-  }, 10000)
+  }, isWindows ? 60000 : 10000)
 })
diff --git a/package.json b/package.json
@@ -47,7 +47,6 @@
     "defu": "^6.1.4",
     "destr": "^2.0.3",
     "estree-walker": "^3.0.3",
-    "execa": "^8.0.1",
     "fake-indexeddb": "^6.0.0",
     "get-port-please": "^3.1.2",
     "local-pkg": "^0.5.0",
@@ -59,6 +58,7 @@
     "radix3": "^1.1.2",
     "scule": "^1.3.0",
     "std-env": "^3.7.0",
+    "tinyexec": "^0.3.0",
     "ufo": "^1.5.4",
     "unenv": "^1.10.0",
     "unplugin": "^1.14.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/_utils.ts b/scripts/_utils.ts
@@ -1,6 +1,6 @@
 import { promises as fsp } from 'node:fs'
 import { resolve } from 'pathe'
-import { execaSync } from 'execa'
+import { exec } from 'tinyexec'
 import { determineSemverChange, getGitDiff, loadChangelogConfig, parseCommits } from 'changelogen'
 
 export interface Dep {
@@ -105,7 +105,7 @@ export async function determineBumpType() {
 
 export async function getLatestCommits() {
   const config = await loadChangelogConfig(process.cwd())
-  const latestTag = execaSync('git', ['describe', '--tags', '--abbrev=0']).stdout
+  const { stdout: latestTag } = await exec('git', ['describe', '--tags', '--abbrev=0'])
 
   return parseCommits(await getGitDiff(latestTag), config)
 }
diff --git a/src/core/server.ts b/src/core/server.ts
@@ -1,4 +1,4 @@
-import { execa } from 'execa'
+import { exec } from 'tinyexec'
 import { getRandomPort, waitForPort } from 'get-port-please'
 import type { FetchOptions } from 'ofetch'
 import { $fetch as _$fetch, fetch as _fetch } from 'ofetch'
@@ -18,29 +18,33 @@ export async function startServer(options: StartServerOptions = {}) {
   const ctx = useTestContext()
   await stopServer()
   const host = '127.0.0.1'
-  const port = ctx.options.port || await getRandomPort(host)
+  const port = ctx.options.port || (await getRandomPort(host))
   ctx.url = `http://${host}:${port}/`
   if (ctx.options.dev) {
     const nuxiCLI = await kit.resolvePath('nuxi/cli')
-    ctx.serverProcess = execa(nuxiCLI, ['_dev'], {
-      cwd: ctx.nuxt!.options.rootDir,
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        _PORT: String(port), // Used by internal _dev command
-        PORT: String(port),
-        HOST: host,
-        NODE_ENV: 'development',
-        ...options.env,
-        ...ctx.options.env,
+    ctx.serverProcess = exec(nuxiCLI, ['_dev'], {
+      nodeOptions: {
+        cwd: ctx.nuxt!.options.rootDir,
+        stdio: 'inherit',
+        env: {
+          ...process.env,
+          _PORT: String(port), // Used by internal _dev command
+          PORT: String(port),
+          HOST: host,
+          NODE_ENV: 'development',
+          ...options.env,
+          ...ctx.options.env,
+        },
       },
     })
     await waitForPort(port, { retries: 32, host }).catch(() => {})
     let lastError
     for (let i = 0; i < 150; i++) {
       await new Promise(resolve => setTimeout(resolve, 100))
       try {
-        const res = await $fetch<string>(ctx.nuxt!.options.app.baseURL, { responseType: 'text' })
+        const res = await $fetch<string>(ctx.nuxt!.options.app.baseURL, {
+          responseType: 'text',
+        })
         if (!res.includes('__NUXT_LOADING__')) {
           return
         }
@@ -53,19 +57,23 @@ export async function startServer(options: StartServerOptions = {}) {
     throw lastError || new Error('Timeout waiting for dev server!')
   }
   else {
-    ctx.serverProcess = execa('node', [
-      resolve(ctx.nuxt!.options.nitro.output!.dir!, 'server/index.mjs'),
-    ], {
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        PORT: String(port),
-        HOST: host,
-        NODE_ENV: 'test',
-        ...options.env,
-        ...ctx.options.env,
+    ctx.serverProcess = exec(
+      'node',
+      [resolve(ctx.nuxt!.options.nitro.output!.dir!, 'server/index.mjs')],
+      {
+        nodeOptions: {
+          stdio: 'inherit',
+          env: {
+            ...process.env,
+            PORT: String(port),
+            HOST: host,
+            NODE_ENV: 'test',
+            ...options.env,
+            ...ctx.options.env,
+          },
+        },
       },
-    })
+    )
     await waitForPort(port, { retries: 20, host })
   }
 }
@@ -81,9 +89,9 @@ export function fetch(path: string, options?: RequestInit) {
   return _fetch(url(path), options)
 }
 
-export const $fetch = (function (path: string, options?: FetchOptions) {
+export const $fetch = function (path: string, options?: FetchOptions) {
   return _$fetch(url(path), options)
-}) as typeof globalThis['$fetch']
+} as (typeof globalThis)['$fetch']
 
 export function url(path: string) {
   const ctx = useTestContext()

diff --git a/src/core/types.ts b/src/core/types.ts
@@ -1,6 +1,6 @@
 import type { Nuxt, NuxtConfig } from '@nuxt/schema'
-import type { ExecaChildProcess } from 'execa'
 import type { Browser, LaunchOptions } from 'playwright-core'
+import type { exec } from 'tinyexec'
 import type { StartServerOptions } from './server'
 
 export type TestRunner = 'vitest' | 'jest' | 'cucumber'
@@ -72,7 +72,7 @@ export interface TestContext {
   nuxt?: Nuxt
   browser?: Browser
   url?: string
-  serverProcess?: ExecaChildProcess
+  serverProcess?: ReturnType<typeof exec>
   mockFn?: (...args: unknown[]) => unknown
   /**
    * Functions to run on the vitest `afterAll` hook.