From b7811f697000d132c5c9cbec05347af91471f7e3 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 07:27:52 +0100
Subject: [PATCH 01/41] chore: add srvx

---
 packages/nuxi/package.json |  1 +
 pnpm-lock.yaml             | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json
index f543e6c3f..ff3f72a01 100644
--- a/packages/nuxi/package.json
+++ b/packages/nuxi/package.json
@@ -68,6 +68,7 @@
     "rollup-plugin-visualizer": "^6.0.1",
     "scule": "^1.3.0",
     "semver": "^7.7.2",
+    "srvx": "^0.7.5",
     "std-env": "^3.9.0",
     "tinyexec": "^1.0.1",
     "typescript": "^5.8.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b4d619533..ca23f260f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -187,6 +187,9 @@ importers:
       semver:
         specifier: ^7.7.2
         version: 7.7.2
+      srvx:
+        specifier: ^0.7.5
+        version: 0.7.5
       std-env:
         specifier: ^3.9.0
         version: 3.9.0
@@ -4752,6 +4755,10 @@ packages:
     resolution: {integrity: sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==}
     engines: {node: '>=12'}
 
+  srvx@0.7.5:
+    resolution: {integrity: sha512-wAQo9uaiOpxX20V7OSNFgKjKHHIQqhsK0sxBGoxID3aIiaiQFRIlGm0bACKvit/iyhEqdWQfEy55R/j/jrqlZg==}
+    engines: {node: '>=20.16.0'}
+
   stable-hash@0.0.5:
     resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
 
@@ -10660,6 +10667,10 @@ snapshots:
 
   split-on-first@3.0.0: {}
 
+  srvx@0.7.5:
+    dependencies:
+      cookie-es: 2.0.0
+
   stable-hash@0.0.5: {}
 
   stack-trace@0.0.10: {}

From 835c274451d4fa57184d2b58fc9d3d5b4d31a86c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 07:48:05 +0100
Subject: [PATCH 02/41] perf: slight performance optimisations for fast path

---
 packages/nuxi/src/commands/dev-child.ts |  2 +
 packages/nuxi/src/commands/dev.ts       | 55 ++++++++++++-------------
 packages/nuxi/src/utils/dev.ts          |  5 +--
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/packages/nuxi/src/commands/dev-child.ts b/packages/nuxi/src/commands/dev-child.ts
index d868beb43..c5587e92e 100644
--- a/packages/nuxi/src/commands/dev-child.ts
+++ b/packages/nuxi/src/commands/dev-child.ts
@@ -25,6 +25,7 @@ export default defineCommand({
     ...legacyRootDirArgs,
   },
   async run(ctx) {
+    const start = Date.now()
     if (!process.send && !isTest) {
       logger.warn('`nuxi _dev` is an internal command and should not be used directly. Please use `nuxi dev` instead.')
     }
@@ -98,5 +99,6 @@ export default defineCommand({
 
     // Init server
     await nuxtDev.init()
+    logger.debug(`Dev server (internal) initialized in ${Date.now() - start}ms`)
   },
 })
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index f81c8b11b..55c668e5e 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -10,12 +10,14 @@ import process from 'node:process'
 
 import { defineCommand } from 'citty'
 import defu from 'defu'
+import { createProxyServer } from 'httpxy'
 import { createJiti } from 'jiti'
+import { listen } from 'listhen'
 import { getArgs as getListhenArgs, parseArgs as parseListhenArgs } from 'listhen/cli'
 import { resolve } from 'pathe'
 import { satisfies } from 'semver'
-
 import { isBun, isTest } from 'std-env'
+
 import { showVersions } from '../utils/banner'
 import { _getDevServerDefaults, _getDevServerOverrides } from '../utils/dev'
 import { overrideEnv } from '../utils/env'
@@ -108,8 +110,8 @@ const command = defineCommand({
     if (ctx.args.fork) {
       // Fork Nuxt dev process
       const devProxy = await _createDevProxy(nuxtOptions, listenOptions)
-      await _startSubprocess(devProxy, ctx.rawArgs, listenOptions)
-      return { listener: devProxy?.listener }
+      _startSubprocess(devProxy, ctx.rawArgs, listenOptions)
+      return { listener: devProxy.listener }
     }
     else {
       // Directly start Nuxt dev
@@ -142,7 +144,7 @@ const command = defineCommand({
         listenOptions,
       )
       await devServer.init()
-      return { listener: devServer?.listener }
+      return { listener: devServer.listener }
     }
   },
 })
@@ -159,24 +161,15 @@ type ArgsT = Exclude<
 type DevProxy = Awaited<ReturnType<typeof _createDevProxy>>
 
 async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<ListenOptions>) {
-  const jiti = createJiti(nuxtOptions.rootDir)
   let loadingMessage = 'Nuxt dev server is starting...'
   let error: Error | undefined
+  let address: string | undefined
+
   let loadingTemplate = nuxtOptions.devServer.loadingTemplate
-  for (const url of nuxtOptions.modulesDir) {
-    // @ts-expect-error this is for backwards compatibility
-    if (loadingTemplate) {
-      break
-    }
-    loadingTemplate = await jiti.import<{ loading: () => string }>('@nuxt/ui-templates', { parentURL: url }).then(r => r.loading)
-  }
 
-  const { createProxyServer } = await import('httpxy')
   const proxy = createProxyServer({})
 
-  let address: string | undefined
-
-  const handler = (req: IncomingMessage, res: ServerResponse) => {
+  const listener = await listen((req: IncomingMessage, res: ServerResponse) => {
     if (error) {
       renderError(req, res, error)
       return
@@ -184,28 +177,34 @@ async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<
     if (!address) {
       res.statusCode = 503
       res.setHeader('Content-Type', 'text/html')
-      res.end(loadingTemplate({ loading: loadingMessage }))
+      if (loadingTemplate) {
+        res.end(loadingTemplate({ loading: loadingMessage }))
+        return
+      }
+      // older versions of Nuxt did not have the loading template defined in the schema
+      const jiti = createJiti(nuxtOptions.rootDir)
+      Promise.race(nuxtOptions.modulesDir.map(async (url) => {
+        return await jiti.import<{ loading: (opts?: { loading?: string }) => string }>('@nuxt/ui-templates', { parentURL: url })
+      })).then((r) => {
+        loadingTemplate = r.loading
+        res.end(r.loading({ loading: loadingMessage }))
+      })
       return
     }
-    return proxy.web(req, res, { target: address })
-  }
+    proxy.web(req, res, { target: address })
+  }, listenOptions)
 
-  const wsHandler = (req: IncomingMessage, socket: any, head: any) => {
+  listener.server.on('upgrade', (req, socket, head) => {
     if (!address) {
       socket.destroy()
       return
     }
+    // @ts-expect-error TODO: fix socket type in httpxy
     return proxy.ws(req, socket, { target: address }, head)
-  }
-
-  const { listen } = await import('listhen')
-  const listener = await listen(handler, listenOptions)
-  listener.server.on('upgrade', wsHandler)
+  })
 
   return {
     listener,
-    handler,
-    wsHandler,
     setAddress: (_addr: string | undefined) => {
       address = _addr
     },
@@ -241,7 +240,7 @@ async function _startSubprocess(devProxy: DevProxy, rawArgs: string[], listenArg
       kill('SIGHUP')
     }
     // Start new process
-    childProc = fork(globalThis.__nuxt_cli__!.entry!, ['_dev', ...rawArgs], {
+    childProc = fork(globalThis.__nuxt_cli__.entry, ['_dev', ...rawArgs], {
       execArgv: [
         '--enable-source-maps',
         process.argv.find((a: string) => a.includes('--inspect')),
diff --git a/packages/nuxi/src/utils/dev.ts b/packages/nuxi/src/utils/dev.ts
index 7207eca50..a2b1bcca7 100644
--- a/packages/nuxi/src/utils/dev.ts
+++ b/packages/nuxi/src/utils/dev.ts
@@ -78,10 +78,7 @@ export async function createNuxtDevServer(options: NuxtDevServerOptions, listenO
   }
   if (options.devContext.proxy?.urls) {
     const _getURLs = devServer.listener.getURLs.bind(devServer.listener)
-    devServer.listener.getURLs = async () =>
-      Array.from(
-        new Set([...options.devContext.proxy!.urls!, ...(await _getURLs())]),
-      )
+    devServer.listener.getURLs = async () => Array.from(new Set([...options.devContext.proxy?.urls || [], ...(await _getURLs())]))
   }
 
   return devServer

From 82738d2d4dde383bcacd8e8bb0b2333cf88b590e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 08:23:44 +0100
Subject: [PATCH 03/41] perf(dev): use standalone dev entrypoint

---
 packages/nuxi/bin/nuxi.mjs                    |  1 +
 packages/nuxi/build.config.ts                 |  5 +-
 packages/nuxi/src/commands/dev-child.ts       | 87 ++--------------
 packages/nuxi/src/commands/dev.ts             | 18 ++--
 packages/nuxi/src/{utils => dev}/error.ts     |  0
 packages/nuxi/src/dev/index.ts                | 98 +++++++++++++++++++
 .../nuxi/src/{utils/dev.ts => dev/utils.ts}   | 18 +++-
 packages/nuxi/src/run.ts                      |  8 ++
 packages/nuxt-cli/bin/nuxi.mjs                |  1 +
 packages/nuxt-cli/build.config.ts             |  2 +-
 packages/nuxt-cli/src/dev.ts                  |  1 +
 packages/nuxt-cli/src/run.ts                  |  8 ++
 types.d.ts                                    |  1 +
 13 files changed, 153 insertions(+), 95 deletions(-)
 rename packages/nuxi/src/{utils => dev}/error.ts (100%)
 create mode 100644 packages/nuxi/src/dev/index.ts
 rename packages/nuxi/src/{utils/dev.ts => dev/utils.ts} (96%)
 create mode 100644 packages/nuxt-cli/src/dev.ts

diff --git a/packages/nuxi/bin/nuxi.mjs b/packages/nuxi/bin/nuxi.mjs
index 7a5eaeffa..08683cf73 100755
--- a/packages/nuxi/bin/nuxi.mjs
+++ b/packages/nuxi/bin/nuxi.mjs
@@ -6,6 +6,7 @@ import { runMain } from '../dist/index.mjs'
 globalThis.__nuxt_cli__ = {
   startTime: Date.now(),
   entry: fileURLToPath(import.meta.url),
+  devEntry: fileURLToPath(new URL('../dist/dev/index.mjs', import.meta.url)),
 }
 
 runMain()
diff --git a/packages/nuxi/build.config.ts b/packages/nuxi/build.config.ts
index 031d108cd..29d8c2afc 100644
--- a/packages/nuxi/build.config.ts
+++ b/packages/nuxi/build.config.ts
@@ -27,7 +27,10 @@ export default defineBuildConfig({
       exportConditions: ['production', 'node'],
     },
   },
-  entries: ['src/index'],
+  entries: [
+    'src/index',
+    'src/dev/index.ts',
+  ],
   externals: [
     '@nuxt/test-utils',
     'fsevents',
diff --git a/packages/nuxi/src/commands/dev-child.ts b/packages/nuxi/src/commands/dev-child.ts
index c5587e92e..d4e87c0c3 100644
--- a/packages/nuxi/src/commands/dev-child.ts
+++ b/packages/nuxi/src/commands/dev-child.ts
@@ -1,15 +1,7 @@
-import type { NuxtDevContext, NuxtDevIPCMessage } from '../utils/dev'
-
 import process from 'node:process'
-
 import { defineCommand } from 'citty'
-import defu from 'defu'
-import { resolve } from 'pathe'
 import { isTest } from 'std-env'
 
-import { _getDevServerDefaults, _getDevServerOverrides, createNuxtDevServer } from '../utils/dev'
-import { overrideEnv } from '../utils/env'
-import { logger } from '../utils/logger'
 import { cwdArgs, dotEnvArgs, envNameArgs, legacyRootDirArgs, logLevelArgs } from './_shared'
 
 export default defineCommand({
@@ -23,82 +15,19 @@ export default defineCommand({
     ...envNameArgs,
     ...dotEnvArgs,
     ...legacyRootDirArgs,
+    clear: {
+      type: 'boolean',
+      description: 'Clear console on restart',
+      negativeDescription: 'Disable clear console on restart',
+    },
   },
   async run(ctx) {
-    const start = Date.now()
     if (!process.send && !isTest) {
-      logger.warn('`nuxi _dev` is an internal command and should not be used directly. Please use `nuxi dev` instead.')
-    }
-
-    // Prepare
-    overrideEnv('development')
-    const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
-
-    // Get dev context info
-    const devContext: NuxtDevContext = JSON.parse(process.env.__NUXT_DEV__ || 'null') || {}
-
-    // IPC Hooks
-    function sendIPCMessage<T extends NuxtDevIPCMessage>(message: T) {
-      if (process.send) {
-        process.send(message)
-      }
-      else {
-        logger.info(
-          'Dev server event:',
-          Object.entries(message)
-            .map(e => `${e[0]}=${JSON.stringify(e[1])}`)
-            .join(' '),
-        )
-      }
+      console.warn('`nuxi _dev` is an internal command and should not be used directly. Please use `nuxi dev` instead.')
     }
 
-    process.once('unhandledRejection', (reason) => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
-      process.exit()
-    })
-
-    const devServerOverrides = _getDevServerOverrides({
-      public: devContext.public,
-    })
-
-    const devServerDefaults = _getDevServerDefaults({
-      hostname: devContext.hostname,
-      https: devContext.proxy?.https,
-    }, devContext.publicURLs)
-
-    // Init Nuxt dev
-    const nuxtDev = await createNuxtDevServer({
-      cwd,
-      overrides: defu(ctx.data?.overrides, devServerOverrides),
-      defaults: devServerDefaults,
-      logLevel: ctx.args.logLevel as 'silent' | 'info' | 'verbose',
-      clear: !!ctx.args.clear,
-      dotenv: { cwd, fileName: ctx.args.dotenv },
-      envName: ctx.args.envName,
-      port: process.env._PORT ?? undefined,
-      devContext,
-    })
-
-    nuxtDev.on('loading:error', (_error) => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:loading:error', error: {
-        message: _error.message,
-        stack: _error.stack,
-        name: _error.name,
-        code: _error.code,
-      } })
-    })
-    nuxtDev.on('loading', (message) => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:loading', message })
-    })
-    nuxtDev.on('restart', () => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:restart' })
-    })
-    nuxtDev.on('ready', (payload) => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
-    })
+    const { initialize } = await import('../dev')
 
-    // Init server
-    await nuxtDev.init()
-    logger.debug(`Dev server (internal) initialized in ${Date.now() - start}ms`)
+    await initialize(ctx)
   },
 })
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 55c668e5e..ad83aa6e9 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -3,7 +3,7 @@ import type { ParsedArgs } from 'citty'
 import type { HTTPSOptions, ListenOptions } from 'listhen'
 import type { ChildProcess } from 'node:child_process'
 import type { IncomingMessage, ServerResponse } from 'node:http'
-import type { NuxtDevContext, NuxtDevIPCMessage } from '../utils/dev'
+import type { NuxtDevContext, NuxtDevIPCMessage } from '../dev/utils'
 
 import { fork } from 'node:child_process'
 import process from 'node:process'
@@ -18,10 +18,9 @@ import { resolve } from 'pathe'
 import { satisfies } from 'semver'
 import { isBun, isTest } from 'std-env'
 
+import { renderError } from '../dev/error'
 import { showVersions } from '../utils/banner'
-import { _getDevServerDefaults, _getDevServerOverrides } from '../utils/dev'
 import { overrideEnv } from '../utils/env'
-import { renderError } from '../utils/error'
 import { loadKit } from '../utils/kit'
 import { logger } from '../utils/logger'
 import { cwdArgs, dotEnvArgs, envNameArgs, legacyRootDirArgs, logLevelArgs } from './_shared'
@@ -110,12 +109,12 @@ const command = defineCommand({
     if (ctx.args.fork) {
       // Fork Nuxt dev process
       const devProxy = await _createDevProxy(nuxtOptions, listenOptions)
-      _startSubprocess(devProxy, ctx.rawArgs, listenOptions)
+      _startSubprocess(devProxy, cwd, ctx.args, listenOptions)
       return { listener: devProxy.listener }
     }
     else {
       // Directly start Nuxt dev
-      const { createNuxtDevServer } = await import('../utils/dev')
+      const { createNuxtDevServer, _getDevServerDefaults, _getDevServerOverrides } = await import('../dev/utils')
 
       const devServerOverrides = _getDevServerOverrides({
         public: listenOptions.public,
@@ -139,7 +138,7 @@ const command = defineCommand({
           },
           envName: ctx.args.envName,
           loadingTemplate: nuxtOptions.devServer.loadingTemplate,
-          devContext: {},
+          devContext: { cwd },
         },
         listenOptions,
       )
@@ -220,9 +219,8 @@ async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<
   }
 }
 
-async function _startSubprocess(devProxy: DevProxy, rawArgs: string[], listenArgs: Partial<ListenOptions>) {
+async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLevel: string, clear: boolean, dotenv: string, envName: string }, listenArgs: Partial<ListenOptions>) {
   let childProc: ChildProcess | undefined
-
   const kill = (signal: NodeJS.Signals | number) => {
     if (childProc) {
       childProc.kill(signal)
@@ -240,7 +238,7 @@ async function _startSubprocess(devProxy: DevProxy, rawArgs: string[], listenArg
       kill('SIGHUP')
     }
     // Start new process
-    childProc = fork(globalThis.__nuxt_cli__.entry, ['_dev', ...rawArgs], {
+    childProc = fork(globalThis.__nuxt_cli__.devEntry, [], {
       execArgv: [
         '--enable-source-maps',
         process.argv.find((a: string) => a.includes('--inspect')),
@@ -248,6 +246,8 @@ async function _startSubprocess(devProxy: DevProxy, rawArgs: string[], listenArg
       env: {
         ...process.env,
         __NUXT_DEV__: JSON.stringify({
+          cwd,
+          args,
           hostname: listenArgs.hostname,
           public: listenArgs.public,
           publicURLs: await devProxy.listener.getURLs().then(r => r.map(r => r.url)),
diff --git a/packages/nuxi/src/utils/error.ts b/packages/nuxi/src/dev/error.ts
similarity index 100%
rename from packages/nuxi/src/utils/error.ts
rename to packages/nuxi/src/dev/error.ts
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
new file mode 100644
index 000000000..fdce44f21
--- /dev/null
+++ b/packages/nuxi/src/dev/index.ts
@@ -0,0 +1,98 @@
+import type { NuxtConfig } from '@nuxt/schema'
+
+import type { NuxtDevContext, NuxtDevIPCMessage } from './utils'
+import process from 'node:process'
+import defu from 'defu'
+import { _getDevServerDefaults, _getDevServerOverrides, createNuxtDevServer } from './utils'
+
+const start = Date.now()
+
+// Prepare
+process.env.NODE_ENV = 'development'
+
+// Get dev context info
+const devContext: NuxtDevContext = JSON.parse(process.env.__NUXT_DEV__ || '{}')
+
+// IPC Hooks
+function sendIPCMessage<T extends NuxtDevIPCMessage>(message: T) {
+  if (process.send) {
+    process.send(message)
+  }
+  else {
+    // eslint-disable-next-line no-console
+    console.info('Dev server event:', Object.entries(message).map(e => `${e[0]}=${JSON.stringify(e[1])}`).join(' '))
+  }
+}
+
+process.once('unhandledRejection', (reason) => {
+  sendIPCMessage({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
+  process.exit()
+})
+
+const devServerOverrides = _getDevServerOverrides({
+  public: devContext.public,
+})
+
+const devServerDefaults = _getDevServerDefaults({
+  hostname: devContext.hostname,
+  https: devContext.proxy?.https,
+}, devContext.publicURLs)
+
+interface InitializeOptions {
+  data?: {
+    overrides?: NuxtConfig
+  }
+  args?: {
+    clear: boolean
+    logLevel: string
+    dotenv: string
+    envName: string
+  }
+}
+
+export async function initialize(ctx: InitializeOptions = {}) {
+  const args = devContext.args || ctx.args || {} as NonNullable<Partial<NuxtDevContext['args']>>
+  // Init Nuxt dev
+  const nuxtDev = await createNuxtDevServer({
+    cwd: devContext.cwd,
+    overrides: defu(ctx.data?.overrides, devServerOverrides),
+    defaults: devServerDefaults,
+    logLevel: args.logLevel as 'silent' | 'info' | 'verbose',
+    clear: !!args.clear,
+    dotenv: { cwd: devContext.cwd, fileName: args.dotenv },
+    envName: args.envName,
+    port: process.env._PORT ?? undefined,
+    devContext,
+  })
+
+  nuxtDev.on('loading:error', (_error) => {
+    sendIPCMessage({ type: 'nuxt:internal:dev:loading:error', error: {
+      message: _error.message,
+      stack: _error.stack,
+      name: _error.name,
+      code: _error.code,
+    } })
+  })
+  nuxtDev.on('loading', (message) => {
+    sendIPCMessage({ type: 'nuxt:internal:dev:loading', message })
+  })
+  nuxtDev.on('restart', () => {
+    sendIPCMessage({ type: 'nuxt:internal:dev:restart' })
+  })
+  nuxtDev.on('ready', (payload) => {
+    sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
+  })
+
+  // Init server
+  await nuxtDev.init()
+
+  if (process.env.DEBUG) {
+    // eslint-disable-next-line no-console
+    console.debug(`Dev server (internal) initialized in ${Date.now() - start}ms`)
+  }
+}
+
+if (process.send) {
+  // eslint-disable-next-line antfu/no-top-level-await
+  await initialize()
+}
diff --git a/packages/nuxi/src/utils/dev.ts b/packages/nuxi/src/dev/utils.ts
similarity index 96%
rename from packages/nuxi/src/utils/dev.ts
rename to packages/nuxi/src/dev/utils.ts
index a2b1bcca7..70f5d36af 100644
--- a/packages/nuxi/src/utils/dev.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -21,8 +21,8 @@ import { joinURL } from 'ufo'
 
 import { clearBuildDir } from '../utils/fs'
 import { loadKit } from '../utils/kit'
-import { logger } from '../utils/logger'
 import { loadNuxtManifest, resolveNuxtManifest, writeNuxtManifest } from '../utils/nuxt'
+
 import { renderError } from './error'
 
 export type NuxtDevIPCMessage =
@@ -33,9 +33,16 @@ export type NuxtDevIPCMessage =
   | { type: 'nuxt:internal:dev:loading:error', error: Error }
 
 export interface NuxtDevContext {
+  cwd: string
   public?: boolean
   hostname?: string
   publicURLs?: string[]
+  args?: {
+    clear: boolean
+    logLevel: string
+    dotenv: string
+    envName: string
+  }
   proxy?: {
     url?: string
     urls?: ListenURL[]
@@ -162,7 +169,7 @@ class NuxtDevServer extends EventEmitter {
       this._loadingError = undefined
     }
     catch (error) {
-      logger.error(`Cannot ${reload ? 'restart' : 'start'} nuxt: `, error)
+      console.error(`Cannot ${reload ? 'restart' : 'start'} nuxt: `, error)
       this._handler = undefined
       this._loadingError = error as Error
       this._loadingMessage = 'Error while loading Nuxt. Please check console and fix errors.'
@@ -176,7 +183,8 @@ class NuxtDevServer extends EventEmitter {
     this._handler = undefined
     this.emit('loading', this._loadingMessage)
     if (reload) {
-      logger.info(this._loadingMessage)
+      // eslint-disable-next-line no-console
+      console.info(this._loadingMessage)
     }
 
     if (this._currentNuxt) {
@@ -292,7 +300,7 @@ class NuxtDevServer extends EventEmitter {
       ?.https as boolean | { key: string, cert: string }
 
     if (this.listener.https && !process.env.NODE_TLS_REJECT_UNAUTHORIZED) {
-      logger.warn('You might need `NODE_TLS_REJECT_UNAUTHORIZED=0` environment variable to make https work.')
+      console.warn('You might need `NODE_TLS_REJECT_UNAUTHORIZED=0` environment variable to make https work.')
     }
 
     await Promise.all([
@@ -348,7 +356,7 @@ export function _getDevServerOverrides(listenOptions: Partial<Pick<ListenOptions
     return {
       devServer: { cors: { origin: '*' } },
       vite: { server: { allowedHosts: true } },
-    }
+    } as const
   }
 
   return {}
diff --git a/packages/nuxi/src/run.ts b/packages/nuxi/src/run.ts
index 16536689c..2e7ef9601 100644
--- a/packages/nuxi/src/run.ts
+++ b/packages/nuxi/src/run.ts
@@ -17,6 +17,14 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
       import.meta.url,
     ),
   ),
+  devEntry: fileURLToPath(
+    new URL(
+      import.meta.url.endsWith('.ts')
+        ? '../dist/dev/index.mjs'
+        : '../../src/dev.ts',
+      import.meta.url,
+    ),
+  ),
 }
 
 export const runMain = () => _runMain(main)
diff --git a/packages/nuxt-cli/bin/nuxi.mjs b/packages/nuxt-cli/bin/nuxi.mjs
index 7a5eaeffa..08683cf73 100755
--- a/packages/nuxt-cli/bin/nuxi.mjs
+++ b/packages/nuxt-cli/bin/nuxi.mjs
@@ -6,6 +6,7 @@ import { runMain } from '../dist/index.mjs'
 globalThis.__nuxt_cli__ = {
   startTime: Date.now(),
   entry: fileURLToPath(import.meta.url),
+  devEntry: fileURLToPath(new URL('../dist/dev/index.mjs', import.meta.url)),
 }
 
 runMain()
diff --git a/packages/nuxt-cli/build.config.ts b/packages/nuxt-cli/build.config.ts
index 08da56903..896892d3d 100644
--- a/packages/nuxt-cli/build.config.ts
+++ b/packages/nuxt-cli/build.config.ts
@@ -23,7 +23,7 @@ export default defineBuildConfig({
       }
     },
   },
-  entries: ['src/index'],
+  entries: ['src/index', 'src/dev.ts'],
   externals: [
     '@nuxt/test-utils',
   ],
diff --git a/packages/nuxt-cli/src/dev.ts b/packages/nuxt-cli/src/dev.ts
new file mode 100644
index 000000000..e0459d272
--- /dev/null
+++ b/packages/nuxt-cli/src/dev.ts
@@ -0,0 +1 @@
+export { initialize } from '../../nuxi/src/dev'
diff --git a/packages/nuxt-cli/src/run.ts b/packages/nuxt-cli/src/run.ts
index 978f9eb5c..eb2c90f0b 100644
--- a/packages/nuxt-cli/src/run.ts
+++ b/packages/nuxt-cli/src/run.ts
@@ -17,6 +17,14 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
       import.meta.url,
     ),
   ),
+  devEntry: fileURLToPath(
+    new URL(
+      import.meta.url.endsWith('.ts')
+        ? '../dist/dev/index.mjs'
+        : '../../src/dev.ts',
+      import.meta.url,
+    ),
+  ),
 }
 
 export const runMain = () => _runMain(main)
diff --git a/types.d.ts b/types.d.ts
index 4c154ee0e..0573975bf 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -6,6 +6,7 @@ declare global {
     | undefined
     | {
       entry: string
+      devEntry: string
       startTime: number
     }
 }

From af177ac127c2097019750c5ccf5260ff43a532f8 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 09:50:10 +0100
Subject: [PATCH 04/41] fix: lazy import jiti + use exsolve to resolve paths

---
 packages/nuxi/package.json              |  1 +
 packages/nuxi/src/commands/dev.ts       | 30 ++++++++++++++++---------
 packages/nuxi/src/commands/info.ts      |  2 +-
 packages/nuxi/src/commands/typecheck.ts |  8 +++----
 packages/nuxi/src/dev/utils.ts          | 22 ++++++++++--------
 packages/nuxi/src/utils/banner.ts       | 18 ++++++++-------
 packages/nuxi/src/utils/kit.ts          | 23 ++++++++++---------
 packages/nuxt-cli/package.json          |  1 +
 pnpm-lock.yaml                          |  6 +++++
 9 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json
index ff3f72a01..c30bcf382 100644
--- a/packages/nuxi/package.json
+++ b/packages/nuxi/package.json
@@ -50,6 +50,7 @@
     "clipboardy": "^4.0.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
+    "exsolve": "^1.0.5",
     "fuse.js": "^7.1.0",
     "giget": "^2.0.0",
     "h3": "^1.15.3",
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index ad83aa6e9..2d396b44e 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -11,7 +11,6 @@ import process from 'node:process'
 import { defineCommand } from 'citty'
 import defu from 'defu'
 import { createProxyServer } from 'httpxy'
-import { createJiti } from 'jiti'
 import { listen } from 'listhen'
 import { getArgs as getListhenArgs, parseArgs as parseListhenArgs } from 'listhen/cli'
 import { resolve } from 'pathe'
@@ -109,7 +108,7 @@ const command = defineCommand({
     if (ctx.args.fork) {
       // Fork Nuxt dev process
       const devProxy = await _createDevProxy(nuxtOptions, listenOptions)
-      _startSubprocess(devProxy, cwd, ctx.args, listenOptions)
+      _startSubprocess(devProxy, cwd, ctx.args, ctx.rawArgs, listenOptions)
       return { listener: devProxy.listener }
     }
     else {
@@ -181,14 +180,23 @@ async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<
         return
       }
       // older versions of Nuxt did not have the loading template defined in the schema
-      const jiti = createJiti(nuxtOptions.rootDir)
-      Promise.race(nuxtOptions.modulesDir.map(async (url) => {
-        return await jiti.import<{ loading: (opts?: { loading?: string }) => string }>('@nuxt/ui-templates', { parentURL: url })
-      })).then((r) => {
-        loadingTemplate = r.loading
-        res.end(r.loading({ loading: loadingMessage }))
-      })
-      return
+
+      async function resolveLoadingMessage() {
+        const { createJiti } = await import('jiti')
+        const jiti = createJiti(nuxtOptions.rootDir)
+        for (const url of nuxtOptions.modulesDir) {
+          const r = await jiti.import<{ loading: (opts?: { loading?: string }) => string }>('@nuxt/ui-templates', {
+            parentURL: url,
+            try: true,
+          })
+          if (r) {
+            loadingTemplate = r.loading
+            res.end(r.loading({ loading: loadingMessage }))
+            break
+          }
+        }
+      }
+      return resolveLoadingMessage()
     }
     proxy.web(req, res, { target: address })
   }, listenOptions)
@@ -238,7 +246,7 @@ async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLeve
       kill('SIGHUP')
     }
     // Start new process
-    childProc = fork(globalThis.__nuxt_cli__.devEntry, [], {
+    childProc = fork(globalThis.__nuxt_cli__.devEntry, rawArgs, {
       execArgv: [
         '--enable-source-maps',
         process.argv.find((a: string) => a.includes('--inspect')),
diff --git a/packages/nuxi/src/commands/info.ts b/packages/nuxi/src/commands/info.ts
index 5ce8b7994..86cfb6d12 100644
--- a/packages/nuxi/src/commands/info.ts
+++ b/packages/nuxi/src/commands/info.ts
@@ -40,7 +40,7 @@ export default defineCommand({
     const { dependencies = {}, devDependencies = {} } = await readPackageJSON(cwd).catch(() => ({} as PackageJson))
 
     // Utils to query a dependency version
-    const nuxtPath = await tryResolveNuxt(cwd)
+    const nuxtPath = tryResolveNuxt(cwd)
     async function getDepVersion(name: string) {
       for (const url of [cwd, nuxtPath]) {
         if (!url) {
diff --git a/packages/nuxi/src/commands/typecheck.ts b/packages/nuxi/src/commands/typecheck.ts
index a435dbbe0..a13c62a05 100644
--- a/packages/nuxi/src/commands/typecheck.ts
+++ b/packages/nuxi/src/commands/typecheck.ts
@@ -2,7 +2,7 @@ import process from 'node:process'
 import { fileURLToPath } from 'node:url'
 
 import { defineCommand } from 'citty'
-import { createJiti } from 'jiti'
+import { resolveModulePath } from 'exsolve'
 import { resolve } from 'pathe'
 import { isBun } from 'std-env'
 import { x } from 'tinyexec'
@@ -41,12 +41,10 @@ export default defineCommand({
     await buildNuxt(nuxt)
     await nuxt.close()
 
-    const jiti = createJiti(cwd)
-
     // Prefer local install if possible
     const [resolvedTypeScript, resolvedVueTsc] = await Promise.all([
-      jiti.esmResolve('typescript', { try: true }),
-      jiti.esmResolve('vue-tsc/bin/vue-tsc.js', { try: true }),
+      resolveModulePath('typescript', { try: true }),
+      resolveModulePath('vue-tsc/bin/vue-tsc.js', { try: true }),
     ])
     if (resolvedTypeScript && resolvedVueTsc) {
       await x(fileURLToPath(resolvedVueTsc), ['--noEmit'], {
diff --git a/packages/nuxi/src/dev/utils.ts b/packages/nuxi/src/dev/utils.ts
index 70f5d36af..5a67ed538 100644
--- a/packages/nuxi/src/dev/utils.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -1,7 +1,6 @@
 import type { Nuxt, NuxtConfig } from '@nuxt/schema'
 import type { DotenvOptions } from 'c12'
 import type { FSWatcher } from 'chokidar'
-import type { Jiti } from 'jiti'
 import type { HTTPSOptions, Listener, ListenOptions, ListenURL } from 'listhen'
 import type { IncomingMessage, RequestListener, ServerResponse } from 'node:http'
 import type { AddressInfo } from 'node:net'
@@ -12,7 +11,6 @@ import process from 'node:process'
 import chokidar from 'chokidar'
 import defu from 'defu'
 import { toNodeListener } from 'h3'
-import { createJiti } from 'jiti'
 import { listen } from 'listhen'
 import { join, relative, resolve } from 'pathe'
 import { debounce } from 'perfect-debounce'
@@ -99,8 +97,8 @@ class NuxtDevServer extends EventEmitter {
   private _distWatcher?: FSWatcher
   private _currentNuxt?: Nuxt
   private _loadingMessage?: string
-  private _jiti: Jiti
   private _loadingError?: Error
+  private cwd: string
 
   loadDebounced: (reload?: boolean, reason?: string) => void
   handler: RequestListener
@@ -119,7 +117,7 @@ class NuxtDevServer extends EventEmitter {
       _initResolve()
     })
 
-    this._jiti = createJiti(options.cwd)
+    this.cwd = options.cwd
 
     this.handler = async (req, res) => {
       if (this._loadingError) {
@@ -143,14 +141,20 @@ class NuxtDevServer extends EventEmitter {
     renderError(req, res, this._loadingError)
   }
 
+  async resolveLoadingTemplate() {
+    const { createJiti } = await import('jiti')
+    const jiti = createJiti(this.cwd)
+    const loading = await jiti.import<{ loading: () => string }>('@nuxt/ui-templates').then(r => r.loading).catch(() => {})
+
+    return loading || ((params: { loading: string }) => `<h2>${params.loading}</h2>`)
+  }
+
   async _renderLoadingScreen(req: IncomingMessage, res: ServerResponse) {
     res.statusCode = 503
     res.setHeader('Content-Type', 'text/html')
-    const loadingTemplate
-      = this.options.loadingTemplate
-        || this._currentNuxt?.options.devServer.loadingTemplate
-        || await this._jiti.import<{ loading: () => string }>('@nuxt/ui-templates').then(r => r.loading).catch(() => {})
-        || ((params: { loading: string }) => `<h2>${params.loading}</h2>`)
+    const loadingTemplate = this.options.loadingTemplate
+      || this._currentNuxt?.options.devServer.loadingTemplate
+      || await this.resolveLoadingTemplate()
     res.end(
       loadingTemplate({
         loading: this._loadingMessage || 'Loading...',
diff --git a/packages/nuxi/src/utils/banner.ts b/packages/nuxi/src/utils/banner.ts
index 635800827..693a68303 100644
--- a/packages/nuxi/src/utils/banner.ts
+++ b/packages/nuxi/src/utils/banner.ts
@@ -1,26 +1,28 @@
+import { readFileSync } from 'node:fs'
+
 import { colors } from 'consola/utils'
-import { readPackageJSON } from 'pkg-types'
+import { resolveModulePath } from 'exsolve'
 
 import { tryResolveNuxt } from './kit'
 import { logger } from './logger'
 
-export async function showVersions(cwd: string) {
+export function showVersions(cwd: string) {
   const { bold, gray, green } = colors
-  const nuxtDir = await tryResolveNuxt(cwd)
-  async function getPkgVersion(pkg: string) {
+  const nuxtDir = tryResolveNuxt(cwd)
+  function getPkgVersion(pkg: string) {
     for (const url of [cwd, nuxtDir]) {
       if (!url) {
         continue
       }
-      const p = await readPackageJSON(pkg, { url }).catch(() => null)
+      const p = resolveModulePath(`${pkg}/package.json`, { from: url, try: true })
       if (p) {
-        return p.version!
+        return JSON.parse(readFileSync(p, 'utf-8')).version as string
       }
     }
     return ''
   }
-  const nuxtVersion = await getPkgVersion('nuxt') || await getPkgVersion('nuxt-nightly') || await getPkgVersion('nuxt3') || await getPkgVersion('nuxt-edge')
-  const nitroVersion = await getPkgVersion('nitropack') || await getPkgVersion('nitropack-nightly') || await getPkgVersion('nitropack-edge')
+  const nuxtVersion = getPkgVersion('nuxt') || getPkgVersion('nuxt-nightly') || getPkgVersion('nuxt3') || getPkgVersion('nuxt-edge')
+  const nitroVersion = getPkgVersion('nitropack') || getPkgVersion('nitropack-nightly') || getPkgVersion('nitropack-edge')
 
   logger.log(gray(green(`Nuxt ${bold(nuxtVersion)}`) + (nitroVersion ? ` with Nitro ${bold(nitroVersion)}` : '')))
 }
diff --git a/packages/nuxi/src/utils/kit.ts b/packages/nuxi/src/utils/kit.ts
index 90ce29078..dcb51fc8c 100644
--- a/packages/nuxi/src/utils/kit.ts
+++ b/packages/nuxi/src/utils/kit.ts
@@ -1,13 +1,17 @@
-import { createJiti } from 'jiti'
+import { pathToFileURL } from 'node:url'
+import { resolveModulePath } from 'exsolve'
 
 export async function loadKit(rootDir: string): Promise<typeof import('@nuxt/kit')> {
-  const jiti = createJiti(rootDir)
   try {
     // Without PNP (or if users have a local install of kit, we bypass resolving from Nuxt)
-    const localKit = jiti.esmResolve('@nuxt/kit', { try: true })
-    // Otherwise, we resolve Nuxt _first_ as it is Nuxt's kit dependency that will be used
-    const rootURL = localKit ? rootDir : (await tryResolveNuxt(rootDir)) || rootDir
-    let kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
+    let kitPath = resolveModulePath('@nuxt/kit', { try: true, from: rootDir })
+    if (!kitPath) {
+      // Otherwise, we resolve Nuxt _first_ as it is Nuxt's kit dependency that will be used
+      const nuxtPath = tryResolveNuxt(rootDir)
+      kitPath = resolveModulePath('@nuxt/kit', { from: nuxtPath || rootDir })
+    }
+
+    let kit: typeof import('@nuxt/kit') = await import(pathToFileURL(kitPath).href)
     if (!kit.writeTypes) {
       kit = {
         ...kit,
@@ -21,17 +25,16 @@ export async function loadKit(rootDir: string): Promise<typeof import('@nuxt/kit
   catch (e: any) {
     if (e.toString().includes('Cannot find module \'@nuxt/kit\'')) {
       throw new Error(
-        'nuxi requires `@nuxt/kit` to be installed in your project. Try installing `nuxt` v3 or `@nuxt/bridge` first.',
+        'nuxi requires `@nuxt/kit` to be installed in your project. Try installing `nuxt` v3+ or `@nuxt/bridge` first.',
       )
     }
     throw e
   }
 }
 
-export async function tryResolveNuxt(rootDir: string) {
-  const jiti = createJiti(rootDir)
+export function tryResolveNuxt(rootDir: string) {
   for (const pkg of ['nuxt-nightly', 'nuxt', 'nuxt3', 'nuxt-edge']) {
-    const path = jiti.esmResolve(pkg, { try: true })
+    const path = resolveModulePath(pkg, { from: rootDir, try: true })
     if (path) {
       return path
     }
diff --git a/packages/nuxt-cli/package.json b/packages/nuxt-cli/package.json
index b47ecedb0..bc75468b4 100644
--- a/packages/nuxt-cli/package.json
+++ b/packages/nuxt-cli/package.json
@@ -39,6 +39,7 @@
     "clipboardy": "^4.0.0",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
+    "exsolve": "^1.0.5",
     "fuse.js": "^7.1.0",
     "giget": "^2.0.0",
     "h3": "^1.15.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ca23f260f..5a3aec180 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -133,6 +133,9 @@ importers:
       defu:
         specifier: ^6.1.4
         version: 6.1.4
+      exsolve:
+        specifier: ^1.0.5
+        version: 1.0.5
       fuse.js:
         specifier: ^7.1.0
         version: 7.1.0
@@ -235,6 +238,9 @@ importers:
       defu:
         specifier: ^6.1.4
         version: 6.1.4
+      exsolve:
+        specifier: ^1.0.5
+        version: 1.0.5
       fuse.js:
         specifier: ^7.1.0
         version: 7.1.0

From 19baee82d9c62da0902bbdd5ea24e5c254c8bc13 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 10:11:34 +0100
Subject: [PATCH 05/41] refactor: deduplicate code for no-fork mode

---
 packages/nuxi/src/commands/dev.ts | 51 ++++++++++----------
 packages/nuxi/src/dev/index.ts    | 78 +++++++++++++++----------------
 2 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 2d396b44e..8cd955322 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -9,7 +9,6 @@ import { fork } from 'node:child_process'
 import process from 'node:process'
 
 import { defineCommand } from 'citty'
-import defu from 'defu'
 import { createProxyServer } from 'httpxy'
 import { listen } from 'listhen'
 import { getArgs as getListhenArgs, parseArgs as parseListhenArgs } from 'listhen/cli'
@@ -101,48 +100,46 @@ const command = defineCommand({
         ...ctx.data?.overrides,
       },
     })
+    performance.mark('load nuxt config')
 
     // Start Proxy Listener
     const listenOptions = _resolveListenOptions(nuxtOptions, ctx.args)
 
     if (ctx.args.fork) {
       // Fork Nuxt dev process
+
       const devProxy = await _createDevProxy(nuxtOptions, listenOptions)
+      performance.mark('create dev proxy')
+
       _startSubprocess(devProxy, cwd, ctx.args, ctx.rawArgs, listenOptions)
+        .finally(() => {
+          performance.mark('start subprocess')
+          let lastTime
+          for (const entry of performance.getEntries()) {
+            lastTime ||= entry.startTime
+            console.log(entry.name, `${(entry.startTime - lastTime).toFixed(2)}ms`)
+            lastTime = entry.startTime
+          }
+          console.log('total time', Date.now() - startTime)
+        })
       return { listener: devProxy.listener }
     }
     else {
       // Directly start Nuxt dev
-      const { createNuxtDevServer, _getDevServerDefaults, _getDevServerOverrides } = await import('../dev/utils')
-
-      const devServerOverrides = _getDevServerOverrides({
-        public: listenOptions.public,
-      })
+      const { initialize } = await import('../dev/index')
 
-      const devServerDefaults = _getDevServerDefaults({
+      const { listener } = await initialize({ data: ctx.data }, {
+        cwd,
+        args: ctx.args,
         hostname: listenOptions.hostname,
-        https: listenOptions.https,
+        public: listenOptions.public,
+        publicURLs: undefined,
+        proxy: {
+          https: listenOptions.https,
+        },
       })
 
-      const devServer = await createNuxtDevServer(
-        {
-          cwd,
-          overrides: defu(ctx.data?.overrides, devServerOverrides),
-          defaults: devServerDefaults,
-          logLevel: ctx.args.logLevel as 'silent' | 'info' | 'verbose',
-          clear: ctx.args.clear,
-          dotenv: {
-            cwd,
-            fileName: ctx.args.dotenv,
-          },
-          envName: ctx.args.envName,
-          loadingTemplate: nuxtOptions.devServer.loadingTemplate,
-          devContext: { cwd },
-        },
-        listenOptions,
-      )
-      await devServer.init()
-      return { listener: devServer.listener }
+      return { listener }
     }
   },
 })
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index fdce44f21..8a7c584e8 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -1,6 +1,6 @@
 import type { NuxtConfig } from '@nuxt/schema'
-
 import type { NuxtDevContext, NuxtDevIPCMessage } from './utils'
+
 import process from 'node:process'
 import defu from 'defu'
 import { _getDevServerDefaults, _getDevServerOverrides, createNuxtDevServer } from './utils'
@@ -10,34 +10,15 @@ const start = Date.now()
 // Prepare
 process.env.NODE_ENV = 'development'
 
-// Get dev context info
-const devContext: NuxtDevContext = JSON.parse(process.env.__NUXT_DEV__ || '{}')
-
 // IPC Hooks
-function sendIPCMessage<T extends NuxtDevIPCMessage>(message: T) {
-  if (process.send) {
-    process.send(message)
-  }
-  else {
-    // eslint-disable-next-line no-console
-    console.info('Dev server event:', Object.entries(message).map(e => `${e[0]}=${JSON.stringify(e[1])}`).join(' '))
-  }
-}
+// eslint-disable-next-line no-console
+const sendIPCMessage = <T extends NuxtDevIPCMessage>(message: T) => process.send?.(message) ?? console.log
 
 process.once('unhandledRejection', (reason) => {
   sendIPCMessage({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
   process.exit()
 })
 
-const devServerOverrides = _getDevServerOverrides({
-  public: devContext.public,
-})
-
-const devServerDefaults = _getDevServerDefaults({
-  hostname: devContext.hostname,
-  https: devContext.proxy?.https,
-}, devContext.publicURLs)
-
 interface InitializeOptions {
   data?: {
     overrides?: NuxtConfig
@@ -50,8 +31,18 @@ interface InitializeOptions {
   }
 }
 
-export async function initialize(ctx: InitializeOptions = {}) {
+export async function initialize(ctx: InitializeOptions = {}, devContext: NuxtDevContext = JSON.parse(process.env.__NUXT_DEV__ || '{}')) {
   const args = devContext.args || ctx.args || {} as NonNullable<Partial<NuxtDevContext['args']>>
+
+  const devServerOverrides = _getDevServerOverrides({
+    public: devContext.public,
+  })
+
+  const devServerDefaults = _getDevServerDefaults({
+    hostname: devContext.hostname,
+    https: devContext.proxy?.https,
+  }, devContext.publicURLs)
+
   // Init Nuxt dev
   const nuxtDev = await createNuxtDevServer({
     cwd: devContext.cwd,
@@ -65,23 +56,28 @@ export async function initialize(ctx: InitializeOptions = {}) {
     devContext,
   })
 
-  nuxtDev.on('loading:error', (_error) => {
-    sendIPCMessage({ type: 'nuxt:internal:dev:loading:error', error: {
-      message: _error.message,
-      stack: _error.stack,
-      name: _error.name,
-      code: _error.code,
-    } })
-  })
-  nuxtDev.on('loading', (message) => {
-    sendIPCMessage({ type: 'nuxt:internal:dev:loading', message })
-  })
-  nuxtDev.on('restart', () => {
-    sendIPCMessage({ type: 'nuxt:internal:dev:restart' })
-  })
-  nuxtDev.on('ready', (payload) => {
-    sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
-  })
+  if (process.send) {
+    nuxtDev.on('loading:error', (_error) => {
+      sendIPCMessage({
+        type: 'nuxt:internal:dev:loading:error',
+        error: {
+          message: _error.message,
+          stack: _error.stack,
+          name: _error.name,
+          code: _error.code,
+        },
+      })
+    })
+    nuxtDev.on('loading', (message) => {
+      sendIPCMessage({ type: 'nuxt:internal:dev:loading', message })
+    })
+    nuxtDev.on('restart', () => {
+      sendIPCMessage({ type: 'nuxt:internal:dev:restart' })
+    })
+    nuxtDev.on('ready', (payload) => {
+      sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
+    })
+  }
 
   // Init server
   await nuxtDev.init()
@@ -90,6 +86,8 @@ export async function initialize(ctx: InitializeOptions = {}) {
     // eslint-disable-next-line no-console
     console.debug(`Dev server (internal) initialized in ${Date.now() - start}ms`)
   }
+
+  return { listener: nuxtDev.listener }
 }
 
 if (process.send) {

From 297f4aa9e08877c5a0e13df87ff45256d462aa99 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 10:52:59 +0100
Subject: [PATCH 06/41] perf(dev): initiate fork in parallel with creating
 proxy

---
 packages/nuxi/src/commands/dev-child.ts |   3 +-
 packages/nuxi/src/commands/dev.ts       | 135 ++++++++++++------------
 packages/nuxi/src/dev/index.ts          |  26 +++--
 packages/nuxi/src/dev/utils.ts          |   4 +
 4 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/packages/nuxi/src/commands/dev-child.ts b/packages/nuxi/src/commands/dev-child.ts
index d4e87c0c3..3fcd996be 100644
--- a/packages/nuxi/src/commands/dev-child.ts
+++ b/packages/nuxi/src/commands/dev-child.ts
@@ -28,6 +28,7 @@ export default defineCommand({
 
     const { initialize } = await import('../dev')
 
-    await initialize(ctx)
+    // @ts-expect-error this should not be called
+    await initialize({}, ctx)
   },
 })
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 8cd955322..8dc085c66 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -103,32 +103,24 @@ const command = defineCommand({
     performance.mark('load nuxt config')
 
     // Start Proxy Listener
-    const listenOptions = _resolveListenOptions(nuxtOptions, ctx.args)
+    const listenOptions = resolveListenOptions(nuxtOptions, ctx.args)
 
     if (ctx.args.fork) {
       // Fork Nuxt dev process
+      const [devProxy, subprocess] = await Promise.all([
+        createDevProxy(nuxtOptions, listenOptions),
+        startSubprocess(cwd, ctx.args, ctx.rawArgs, listenOptions),
+      ])
+
+      await subprocess.initialize(devProxy)
 
-      const devProxy = await _createDevProxy(nuxtOptions, listenOptions)
-      performance.mark('create dev proxy')
-
-      _startSubprocess(devProxy, cwd, ctx.args, ctx.rawArgs, listenOptions)
-        .finally(() => {
-          performance.mark('start subprocess')
-          let lastTime
-          for (const entry of performance.getEntries()) {
-            lastTime ||= entry.startTime
-            console.log(entry.name, `${(entry.startTime - lastTime).toFixed(2)}ms`)
-            lastTime = entry.startTime
-          }
-          console.log('total time', Date.now() - startTime)
-        })
       return { listener: devProxy.listener }
     }
     else {
       // Directly start Nuxt dev
       const { initialize } = await import('../dev/index')
 
-      const { listener } = await initialize({ data: ctx.data }, {
+      const { listener } = await initialize({
         cwd,
         args: ctx.args,
         hostname: listenOptions.hostname,
@@ -137,7 +129,7 @@ const command = defineCommand({
         proxy: {
           https: listenOptions.https,
         },
-      })
+      }, { data: ctx.data })
 
       return { listener }
     }
@@ -153,9 +145,9 @@ type ArgsT = Exclude<
   undefined | ((...args: unknown[]) => unknown)
 >
 
-type DevProxy = Awaited<ReturnType<typeof _createDevProxy>>
+type DevProxy = Awaited<ReturnType<typeof createDevProxy>>
 
-async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<ListenOptions>) {
+async function createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<ListenOptions>) {
   let loadingMessage = 'Nuxt dev server is starting...'
   let error: Error | undefined
   let address: string | undefined
@@ -224,8 +216,10 @@ async function _createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<
   }
 }
 
-async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLevel: string, clear: boolean, dotenv: string, envName: string }, listenArgs: Partial<ListenOptions>) {
+async function startSubprocess(cwd: string, args: { logLevel: string, clear: boolean, dotenv: string, envName: string }, rawArgs: string[], listenArgs: Partial<ListenOptions>) {
   let childProc: ChildProcess | undefined
+  let devProxy: DevProxy
+  let ready: Promise<void> | undefined
   const kill = (signal: NodeJS.Signals | number) => {
     if (childProc) {
       childProc.kill(signal)
@@ -233,8 +227,29 @@ async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLeve
     }
   }
 
-  const restart = async () => {
-    devProxy.clearError()
+  async function initialize(proxy: DevProxy) {
+    devProxy = proxy
+    const urls = await devProxy.listener.getURLs()
+    await ready
+    childProc!.send({
+      type: 'nuxt:internal:dev:context',
+      context: {
+        cwd,
+        args,
+        hostname: listenArgs.hostname,
+        public: listenArgs.public,
+        publicURLs: urls.map(r => r.url),
+        proxy: {
+          url: devProxy.listener.url,
+          urls,
+          https: devProxy.listener.https,
+        },
+      } satisfies NuxtDevContext,
+    })
+  }
+
+  async function restart() {
+    devProxy?.clearError()
     // Kill previous process with restart signal (not supported on Windows)
     if (process.platform === 'win32') {
       kill('SIGTERM')
@@ -244,25 +259,8 @@ async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLeve
     }
     // Start new process
     childProc = fork(globalThis.__nuxt_cli__.devEntry, rawArgs, {
-      execArgv: [
-        '--enable-source-maps',
-        process.argv.find((a: string) => a.includes('--inspect')),
-      ].filter(Boolean) as string[],
-      env: {
-        ...process.env,
-        __NUXT_DEV__: JSON.stringify({
-          cwd,
-          args,
-          hostname: listenArgs.hostname,
-          public: listenArgs.public,
-          publicURLs: await devProxy.listener.getURLs().then(r => r.map(r => r.url)),
-          proxy: {
-            url: devProxy.listener.url,
-            urls: await devProxy.listener.getURLs(),
-            https: devProxy.listener.https,
-          },
-        } satisfies NuxtDevContext),
-      },
+      execArgv: ['--enable-source-maps', process.argv.find((a: string) => a.includes('--inspect'))].filter(Boolean) as string[],
+      env: process.env,
     })
 
     // Close main process on child exit with error
@@ -273,30 +271,36 @@ async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLeve
     })
 
     // Listen for IPC messages
-    childProc.on('message', (message: NuxtDevIPCMessage) => {
-      if (message.type === 'nuxt:internal:dev:ready') {
-        devProxy.setAddress(`http://127.0.0.1:${message.port}`)
-        if (startTime) {
-          logger.debug(`Dev server ready for connections in ${Date.now() - startTime}ms`)
-          startTime = undefined
+    ready = new Promise((resolve, reject) => {
+      childProc!.on('error', reject)
+      childProc!.on('message', (message: NuxtDevIPCMessage) => {
+        if (message.type === 'nuxt:internal:dev:fork-ready') {
+          resolve()
         }
-      }
-      else if (message.type === 'nuxt:internal:dev:loading') {
-        devProxy.setAddress(undefined)
-        devProxy.setLoadingMessage(message.message)
-        devProxy.clearError()
-      }
-      else if (message.type === 'nuxt:internal:dev:loading:error') {
-        devProxy.setAddress(undefined)
-        devProxy.setError(message.error)
-      }
-      else if (message.type === 'nuxt:internal:dev:restart') {
-        restart()
-      }
-      else if (message.type === 'nuxt:internal:dev:rejection') {
-        logger.info(`Restarting Nuxt due to error: \`${message.message}\``)
-        restart()
-      }
+        else if (message.type === 'nuxt:internal:dev:ready') {
+          devProxy.setAddress(`http://127.0.0.1:${message.port}`)
+          performance.mark('dev ready')
+          if (startTime) {
+            logger.debug(`Dev server ready for connections in ${Date.now() - startTime}ms`)
+          }
+        }
+        else if (message.type === 'nuxt:internal:dev:loading') {
+          devProxy.setAddress(undefined)
+          devProxy.setLoadingMessage(message.message)
+          devProxy.clearError()
+        }
+        else if (message.type === 'nuxt:internal:dev:loading:error') {
+          devProxy.setAddress(undefined)
+          devProxy.setError(message.error)
+        }
+        else if (message.type === 'nuxt:internal:dev:restart') {
+          restart()
+        }
+        else if (message.type === 'nuxt:internal:dev:rejection') {
+          logger.info(`Restarting Nuxt due to error: \`${message.message}\``)
+          restart()
+        }
+      })
     })
   }
 
@@ -315,12 +319,13 @@ async function _startSubprocess(devProxy: DevProxy, cwd: string, args: { logLeve
   await restart()
 
   return {
+    initialize,
     restart,
     kill,
   }
 }
 
-function _resolveListenOptions(
+function resolveListenOptions(
   nuxtOptions: NuxtOptions,
   args: ParsedArgs<ArgsT>,
 ): Partial<ListenOptions> {
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index 8a7c584e8..16e763208 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -1,5 +1,5 @@
 import type { NuxtConfig } from '@nuxt/schema'
-import type { NuxtDevContext, NuxtDevIPCMessage } from './utils'
+import type { NuxtDevContext, NuxtDevIPCMessage, NuxtParentIPCMessage } from './utils'
 
 import process from 'node:process'
 import defu from 'defu'
@@ -31,7 +31,7 @@ interface InitializeOptions {
   }
 }
 
-export async function initialize(ctx: InitializeOptions = {}, devContext: NuxtDevContext = JSON.parse(process.env.__NUXT_DEV__ || '{}')) {
+export async function initialize(devContext: NuxtDevContext, ctx: InitializeOptions = {}) {
   const args = devContext.args || ctx.args || {} as NonNullable<Partial<NuxtDevContext['args']>>
 
   const devServerOverrides = _getDevServerOverrides({
@@ -44,7 +44,7 @@ export async function initialize(ctx: InitializeOptions = {}, devContext: NuxtDe
   }, devContext.publicURLs)
 
   // Init Nuxt dev
-  const nuxtDev = await createNuxtDevServer({
+  const devServer = await createNuxtDevServer({
     cwd: devContext.cwd,
     overrides: defu(ctx.data?.overrides, devServerOverrides),
     defaults: devServerDefaults,
@@ -57,7 +57,7 @@ export async function initialize(ctx: InitializeOptions = {}, devContext: NuxtDe
   })
 
   if (process.send) {
-    nuxtDev.on('loading:error', (_error) => {
+    devServer.on('loading:error', (_error) => {
       sendIPCMessage({
         type: 'nuxt:internal:dev:loading:error',
         error: {
@@ -68,29 +68,33 @@ export async function initialize(ctx: InitializeOptions = {}, devContext: NuxtDe
         },
       })
     })
-    nuxtDev.on('loading', (message) => {
+    devServer.on('loading', (message) => {
       sendIPCMessage({ type: 'nuxt:internal:dev:loading', message })
     })
-    nuxtDev.on('restart', () => {
+    devServer.on('restart', () => {
       sendIPCMessage({ type: 'nuxt:internal:dev:restart' })
     })
-    nuxtDev.on('ready', (payload) => {
+    devServer.on('ready', (payload) => {
       sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
     })
   }
 
   // Init server
-  await nuxtDev.init()
+  await devServer.init()
 
   if (process.env.DEBUG) {
     // eslint-disable-next-line no-console
     console.debug(`Dev server (internal) initialized in ${Date.now() - start}ms`)
   }
 
-  return { listener: nuxtDev.listener }
+  return { listener: devServer.listener }
 }
 
 if (process.send) {
-  // eslint-disable-next-line antfu/no-top-level-await
-  await initialize()
+  sendIPCMessage({ type: 'nuxt:internal:dev:fork-ready' })
+  process.on('message', (message: NuxtParentIPCMessage) => {
+    if (message.type === 'nuxt:internal:dev:context') {
+      initialize(message.context)
+    }
+  })
 }
diff --git a/packages/nuxi/src/dev/utils.ts b/packages/nuxi/src/dev/utils.ts
index 5a67ed538..19c4dff9c 100644
--- a/packages/nuxi/src/dev/utils.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -23,7 +23,11 @@ import { loadNuxtManifest, resolveNuxtManifest, writeNuxtManifest } from '../uti
 
 import { renderError } from './error'
 
+export type NuxtParentIPCMessage =
+  | { type: 'nuxt:internal:dev:context', context: NuxtDevContext }
+
 export type NuxtDevIPCMessage =
+  | { type: 'nuxt:internal:dev:fork-ready' }
   | { type: 'nuxt:internal:dev:ready', port: number }
   | { type: 'nuxt:internal:dev:loading', message: string }
   | { type: 'nuxt:internal:dev:restart' }

From 466590cf90c79eed5c85b3e8b4b4598ac19bc416 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 11:00:10 +0100
Subject: [PATCH 07/41] fix: pass cwd to initialize

---
 packages/nuxi/src/commands/dev-child.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nuxi/src/commands/dev-child.ts b/packages/nuxi/src/commands/dev-child.ts
index 3fcd996be..6fda4998a 100644
--- a/packages/nuxi/src/commands/dev-child.ts
+++ b/packages/nuxi/src/commands/dev-child.ts
@@ -1,5 +1,6 @@
 import process from 'node:process'
 import { defineCommand } from 'citty'
+import { resolve } from 'pathe'
 import { isTest } from 'std-env'
 
 import { cwdArgs, dotEnvArgs, envNameArgs, legacyRootDirArgs, logLevelArgs } from './_shared'
@@ -26,9 +27,9 @@ export default defineCommand({
       console.warn('`nuxi _dev` is an internal command and should not be used directly. Please use `nuxi dev` instead.')
     }
 
-    const { initialize } = await import('../dev')
+    const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
 
-    // @ts-expect-error this should not be called
-    await initialize({}, ctx)
+    const { initialize } = await import('../dev')
+    await initialize({ cwd }, ctx)
   },
 })

From f342cd5d02cfbe597f726a2542e516de8b28b896 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 11:09:41 +0100
Subject: [PATCH 08/41] refactor: pass args through dev context

---
 packages/nuxi/src/commands/build.ts     |  2 +-
 packages/nuxi/src/commands/dev-child.ts |  2 +-
 packages/nuxi/src/commands/dev.ts       |  3 +--
 packages/nuxi/src/dev/index.ts          | 18 +++++-------------
 packages/nuxi/src/dev/utils.ts          |  2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/nuxi/src/commands/build.ts b/packages/nuxi/src/commands/build.ts
index 40136e365..b6c2469bf 100644
--- a/packages/nuxi/src/commands/build.ts
+++ b/packages/nuxi/src/commands/build.ts
@@ -37,7 +37,7 @@ export default defineCommand({
 
     const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
 
-    await showVersions(cwd)
+    showVersions(cwd)
 
     const kit = await loadKit(cwd)
 
diff --git a/packages/nuxi/src/commands/dev-child.ts b/packages/nuxi/src/commands/dev-child.ts
index 6fda4998a..c3557d145 100644
--- a/packages/nuxi/src/commands/dev-child.ts
+++ b/packages/nuxi/src/commands/dev-child.ts
@@ -30,6 +30,6 @@ export default defineCommand({
     const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
 
     const { initialize } = await import('../dev')
-    await initialize({ cwd }, ctx)
+    await initialize({ cwd, args: ctx.args }, ctx)
   },
 })
diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 8dc085c66..9381370bf 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -86,7 +86,7 @@ const command = defineCommand({
     // Prepare
     overrideEnv('development')
     const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
-    await showVersions(cwd)
+    showVersions(cwd)
 
     // Load Nuxt Config
     const { loadNuxtConfig } = await loadKit(cwd)
@@ -279,7 +279,6 @@ async function startSubprocess(cwd: string, args: { logLevel: string, clear: boo
         }
         else if (message.type === 'nuxt:internal:dev:ready') {
           devProxy.setAddress(`http://127.0.0.1:${message.port}`)
-          performance.mark('dev ready')
           if (startTime) {
             logger.debug(`Dev server ready for connections in ${Date.now() - startTime}ms`)
           }
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index 16e763208..6a7bf07f9 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -12,7 +12,7 @@ process.env.NODE_ENV = 'development'
 
 // IPC Hooks
 // eslint-disable-next-line no-console
-const sendIPCMessage = <T extends NuxtDevIPCMessage>(message: T) => process.send?.(message) ?? console.log
+const sendIPCMessage = <T extends NuxtDevIPCMessage>(message: T) => process.send?.(message) ?? console.log(message)
 
 process.once('unhandledRejection', (reason) => {
   sendIPCMessage({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
@@ -23,17 +23,9 @@ interface InitializeOptions {
   data?: {
     overrides?: NuxtConfig
   }
-  args?: {
-    clear: boolean
-    logLevel: string
-    dotenv: string
-    envName: string
-  }
 }
 
 export async function initialize(devContext: NuxtDevContext, ctx: InitializeOptions = {}) {
-  const args = devContext.args || ctx.args || {} as NonNullable<Partial<NuxtDevContext['args']>>
-
   const devServerOverrides = _getDevServerOverrides({
     public: devContext.public,
   })
@@ -48,10 +40,10 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
     cwd: devContext.cwd,
     overrides: defu(ctx.data?.overrides, devServerOverrides),
     defaults: devServerDefaults,
-    logLevel: args.logLevel as 'silent' | 'info' | 'verbose',
-    clear: !!args.clear,
-    dotenv: { cwd: devContext.cwd, fileName: args.dotenv },
-    envName: args.envName,
+    logLevel: devContext.args.logLevel as 'silent' | 'info' | 'verbose',
+    clear: !!devContext.args.clear,
+    dotenv: { cwd: devContext.cwd, fileName: devContext.args.dotenv },
+    envName: devContext.args.envName,
     port: process.env._PORT ?? undefined,
     devContext,
   })
diff --git a/packages/nuxi/src/dev/utils.ts b/packages/nuxi/src/dev/utils.ts
index 19c4dff9c..dc28bb8cc 100644
--- a/packages/nuxi/src/dev/utils.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -39,7 +39,7 @@ export interface NuxtDevContext {
   public?: boolean
   hostname?: string
   publicURLs?: string[]
-  args?: {
+  args: {
     clear: boolean
     logLevel: string
     dotenv: string

From 4f2ce92b406ec0b49d154d8c8715a1e3d073ff57 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 11:09:52 +0100
Subject: [PATCH 09/41] build: fix nuxt-cli build

---
 packages/nuxt-cli/build.config.ts  | 3 ++-
 packages/nuxt-cli/src/dev.ts       | 1 -
 packages/nuxt-cli/src/dev/index.ts | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 packages/nuxt-cli/src/dev.ts
 create mode 100644 packages/nuxt-cli/src/dev/index.ts

diff --git a/packages/nuxt-cli/build.config.ts b/packages/nuxt-cli/build.config.ts
index 896892d3d..20f394b0e 100644
--- a/packages/nuxt-cli/build.config.ts
+++ b/packages/nuxt-cli/build.config.ts
@@ -23,8 +23,9 @@ export default defineBuildConfig({
       }
     },
   },
-  entries: ['src/index', 'src/dev.ts'],
+  entries: ['src/index', 'src/dev/index.ts'],
   externals: [
     '@nuxt/test-utils',
+    '@nuxt/schema',
   ],
 })
diff --git a/packages/nuxt-cli/src/dev.ts b/packages/nuxt-cli/src/dev.ts
deleted file mode 100644
index e0459d272..000000000
--- a/packages/nuxt-cli/src/dev.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { initialize } from '../../nuxi/src/dev'
diff --git a/packages/nuxt-cli/src/dev/index.ts b/packages/nuxt-cli/src/dev/index.ts
new file mode 100644
index 000000000..3b11bf3c4
--- /dev/null
+++ b/packages/nuxt-cli/src/dev/index.ts
@@ -0,0 +1 @@
+export { initialize } from '../../../nuxi/src/dev'

From dab2e80f64e8cd5b7664aab17c475ddd9a3c3249 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 16:58:29 +0200
Subject: [PATCH 10/41] fix: pass listen options to no-forked dev server

---
 packages/nuxi/src/commands/dev.ts | 10 +++++-----
 packages/nuxi/src/dev/index.ts    |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 9381370bf..23684e223 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -100,13 +100,13 @@ const command = defineCommand({
         ...ctx.data?.overrides,
       },
     })
-    performance.mark('load nuxt config')
 
     // Start Proxy Listener
     const listenOptions = resolveListenOptions(nuxtOptions, ctx.args)
 
     if (ctx.args.fork) {
       // Fork Nuxt dev process
+      // TODO: run in no-fork mode, then fall back to prepared fork
       const [devProxy, subprocess] = await Promise.all([
         createDevProxy(nuxtOptions, listenOptions),
         startSubprocess(cwd, ctx.args, ctx.rawArgs, listenOptions),
@@ -129,7 +129,7 @@ const command = defineCommand({
         proxy: {
           https: listenOptions.https,
         },
-      }, { data: ctx.data })
+      }, { data: ctx.data }, listenOptions)
 
       return { listener }
     }
@@ -216,7 +216,7 @@ async function createDevProxy(nuxtOptions: NuxtOptions, listenOptions: Partial<L
   }
 }
 
-async function startSubprocess(cwd: string, args: { logLevel: string, clear: boolean, dotenv: string, envName: string }, rawArgs: string[], listenArgs: Partial<ListenOptions>) {
+async function startSubprocess(cwd: string, args: { logLevel: string, clear: boolean, dotenv: string, envName: string }, rawArgs: string[], listenOptions: Partial<ListenOptions>) {
   let childProc: ChildProcess | undefined
   let devProxy: DevProxy
   let ready: Promise<void> | undefined
@@ -236,8 +236,8 @@ async function startSubprocess(cwd: string, args: { logLevel: string, clear: boo
       context: {
         cwd,
         args,
-        hostname: listenArgs.hostname,
-        public: listenArgs.public,
+        hostname: listenOptions.hostname,
+        public: listenOptions.public,
         publicURLs: urls.map(r => r.url),
         proxy: {
           url: devProxy.listener.url,
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index 6a7bf07f9..fefa32812 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -1,4 +1,5 @@
 import type { NuxtConfig } from '@nuxt/schema'
+import type { ListenOptions } from 'listhen'
 import type { NuxtDevContext, NuxtDevIPCMessage, NuxtParentIPCMessage } from './utils'
 
 import process from 'node:process'
@@ -25,7 +26,7 @@ interface InitializeOptions {
   }
 }
 
-export async function initialize(devContext: NuxtDevContext, ctx: InitializeOptions = {}) {
+export async function initialize(devContext: NuxtDevContext, ctx: InitializeOptions = {}, listenOptions?: Partial<ListenOptions>) {
   const devServerOverrides = _getDevServerOverrides({
     public: devContext.public,
   })
@@ -46,7 +47,7 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
     envName: devContext.args.envName,
     port: process.env._PORT ?? undefined,
     devContext,
-  })
+  }, listenOptions)
 
   if (process.send) {
     devServer.on('loading:error', (_error) => {

From 422c8b820d980abbb8fdcb1b4f54f84613195d61 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 17:07:01 +0200
Subject: [PATCH 11/41] chore: remove srvx (not yet used)

---
 packages/nuxi/package.json |  1 -
 pnpm-lock.yaml             | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json
index c30bcf382..865bda94d 100644
--- a/packages/nuxi/package.json
+++ b/packages/nuxi/package.json
@@ -69,7 +69,6 @@
     "rollup-plugin-visualizer": "^6.0.1",
     "scule": "^1.3.0",
     "semver": "^7.7.2",
-    "srvx": "^0.7.5",
     "std-env": "^3.9.0",
     "tinyexec": "^1.0.1",
     "typescript": "^5.8.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5a3aec180..08404d12b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -190,9 +190,6 @@ importers:
       semver:
         specifier: ^7.7.2
         version: 7.7.2
-      srvx:
-        specifier: ^0.7.5
-        version: 0.7.5
       std-env:
         specifier: ^3.9.0
         version: 3.9.0
@@ -4761,10 +4758,6 @@ packages:
     resolution: {integrity: sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==}
     engines: {node: '>=12'}
 
-  srvx@0.7.5:
-    resolution: {integrity: sha512-wAQo9uaiOpxX20V7OSNFgKjKHHIQqhsK0sxBGoxID3aIiaiQFRIlGm0bACKvit/iyhEqdWQfEy55R/j/jrqlZg==}
-    engines: {node: '>=20.16.0'}
-
   stable-hash@0.0.5:
     resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
 
@@ -10673,10 +10666,6 @@ snapshots:
 
   split-on-first@3.0.0: {}
 
-  srvx@0.7.5:
-    dependencies:
-      cookie-es: 2.0.0
-
   stable-hash@0.0.5: {}
 
   stack-trace@0.0.10: {}

From 54d180c14173280c261eaadddbf11c75ff999d84 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Wed, 4 Jun 2025 15:09:57 +0000
Subject: [PATCH 12/41] [autofix.ci] apply automated fixes

---
 packages/nuxi/src/commands/dev.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 23684e223..ed60f71c8 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -23,7 +23,7 @@ import { loadKit } from '../utils/kit'
 import { logger } from '../utils/logger'
 import { cwdArgs, dotEnvArgs, envNameArgs, legacyRootDirArgs, logLevelArgs } from './_shared'
 
-let startTime: number | undefined = Date.now()
+const startTime: number | undefined = Date.now()
 const forkSupported = !isTest && (!isBun || isBunForkSupported())
 const listhenArgs = getListhenArgs()
 

From 18312aa697b5cdd17266edf457c89fa55ab7798f Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 17:13:10 +0200
Subject: [PATCH 13/41] chore: ignore `exsolve`

---
 knip.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/knip.json b/knip.json
index 46b548390..c4c4b35fe 100644
--- a/knip.json
+++ b/knip.json
@@ -21,6 +21,7 @@
         "clipboardy",
         "consola",
         "defu",
+        "exsolve",
         "fuse.js",
         "giget",
         "h3",

From 78d33d0a0ccf92f586f14d3fdc64d08b269d81cb Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 4 Jun 2025 17:13:40 +0200
Subject: [PATCH 14/41] chore: assert devEntry

---
 packages/nuxi/src/commands/dev.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index ed60f71c8..a271611e1 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -258,7 +258,7 @@ async function startSubprocess(cwd: string, args: { logLevel: string, clear: boo
       kill('SIGHUP')
     }
     // Start new process
-    childProc = fork(globalThis.__nuxt_cli__.devEntry, rawArgs, {
+    childProc = fork(globalThis.__nuxt_cli__.devEntry!, rawArgs, {
       execArgv: ['--enable-source-maps', process.argv.find((a: string) => a.includes('--inspect'))].filter(Boolean) as string[],
       env: process.env,
     })

From 556b30b69facbf13e2525b63e3da75d1e82cedd1 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 06:39:43 +0200
Subject: [PATCH 15/41] fix: don't spin up ipc if we're in a vitest child
 process

---
 packages/nuxi/src/dev/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index fefa32812..288a65332 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -13,7 +13,11 @@ process.env.NODE_ENV = 'development'
 
 // IPC Hooks
 // eslint-disable-next-line no-console
-const sendIPCMessage = <T extends NuxtDevIPCMessage>(message: T) => process.send?.(message) ?? console.log(message)
+const sendIPCMessage = <T extends NuxtDevIPCMessage> (message: T) => process.send?.(message) ?? console.log(message)
+
+function isChildProcess() {
+  return !!process.send && !process.title.includes('vitest')
+}
 
 process.once('unhandledRejection', (reason) => {
   sendIPCMessage({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
@@ -49,7 +53,7 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
     devContext,
   }, listenOptions)
 
-  if (process.send) {
+  if (isChildProcess()) {
     devServer.on('loading:error', (_error) => {
       sendIPCMessage({
         type: 'nuxt:internal:dev:loading:error',
@@ -83,7 +87,7 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
   return { listener: devServer.listener }
 }
 
-if (process.send) {
+if (isChildProcess()) {
   sendIPCMessage({ type: 'nuxt:internal:dev:fork-ready' })
   process.on('message', (message: NuxtParentIPCMessage) => {
     if (message.type === 'nuxt:internal:dev:context') {

From ffc6187478a1ff93d7123007de6dd8d117b7a8d4 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 07:50:51 +0200
Subject: [PATCH 16/41] fix: use nitro dev server types

---
 packages/nuxi/src/dev/index.ts |  6 ++---
 packages/nuxi/src/dev/utils.ts | 48 ++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index 288a65332..c2864a1d6 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -4,7 +4,7 @@ import type { NuxtDevContext, NuxtDevIPCMessage, NuxtParentIPCMessage } from './
 
 import process from 'node:process'
 import defu from 'defu'
-import { _getDevServerDefaults, _getDevServerOverrides, createNuxtDevServer } from './utils'
+import { createNuxtDevServer, resolveDevServerDefaults, resolveDevServerOverrides } from './utils'
 
 const start = Date.now()
 
@@ -31,11 +31,11 @@ interface InitializeOptions {
 }
 
 export async function initialize(devContext: NuxtDevContext, ctx: InitializeOptions = {}, listenOptions?: Partial<ListenOptions>) {
-  const devServerOverrides = _getDevServerOverrides({
+  const devServerOverrides = resolveDevServerOverrides({
     public: devContext.public,
   })
 
-  const devServerDefaults = _getDevServerDefaults({
+  const devServerDefaults = resolveDevServerDefaults({
     hostname: devContext.hostname,
     https: devContext.proxy?.https,
   }, devContext.publicURLs)
diff --git a/packages/nuxi/src/dev/utils.ts b/packages/nuxi/src/dev/utils.ts
index dc28bb8cc..7fdceb181 100644
--- a/packages/nuxi/src/dev/utils.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -2,6 +2,7 @@ import type { Nuxt, NuxtConfig } from '@nuxt/schema'
 import type { DotenvOptions } from 'c12'
 import type { FSWatcher } from 'chokidar'
 import type { HTTPSOptions, Listener, ListenOptions, ListenURL } from 'listhen'
+import type { NitroDevServer } from 'nitropack'
 import type { IncomingMessage, RequestListener, ServerResponse } from 'node:http'
 import type { AddressInfo } from 'node:net'
 
@@ -96,10 +97,12 @@ export async function createNuxtDevServer(options: NuxtDevServerOptions, listenO
 // https://regex101.com/r/7HkR5c/1
 const RESTART_RE = /^(?:nuxt\.config\.[a-z0-9]+|\.nuxtignore|\.nuxtrc|\.config\/nuxt(?:\.config)?\.[a-z0-9]+)$/
 
+type NuxtWithServer = Omit<Nuxt, 'server'> & { server?: NitroDevServer }
+
 class NuxtDevServer extends EventEmitter {
   private _handler?: RequestListener
   private _distWatcher?: FSWatcher
-  private _currentNuxt?: Nuxt
+  private _currentNuxt?: NuxtWithServer
   private _loadingMessage?: string
   private _loadingError?: Error
   private cwd: string
@@ -204,7 +207,7 @@ class NuxtDevServer extends EventEmitter {
 
     const kit = await loadKit(this.options.cwd)
 
-    const devServerDefaults = _getDevServerDefaults({}, await this.listener.getURLs().then(r => r.map(r => r.url)))
+    const devServerDefaults = resolveDevServerDefaults({}, await this.listener.getURLs().then(r => r.map(r => r.url)))
 
     this._currentNuxt = await kit.loadNuxt({
       cwd: this.options.cwd,
@@ -278,22 +281,19 @@ class NuxtDevServer extends EventEmitter {
     })
 
     if (this._currentNuxt.server && 'upgrade' in this._currentNuxt.server) {
-      this.listener.server.on(
-        'upgrade',
-        async (req: any, socket: any, head: any) => {
-          const nuxt = this._currentNuxt
-          if (!nuxt)
-            return
-          const viteHmrPath = joinURL(
-            nuxt.options.app.baseURL.startsWith('./') ? nuxt.options.app.baseURL.slice(1) : nuxt.options.app.baseURL,
-            nuxt.options.app.buildAssetsDir,
-          )
-          if (req.url.startsWith(viteHmrPath)) {
-            return // Skip for Vite HMR
-          }
-          await nuxt.server.upgrade(req, socket, head)
-        },
-      )
+      this.listener.server.on('upgrade', (req, socket, head) => {
+        const nuxt = this._currentNuxt
+        if (!nuxt || !nuxt.server)
+          return
+        const viteHmrPath = joinURL(
+          nuxt.options.app.baseURL.startsWith('./') ? nuxt.options.app.baseURL.slice(1) : nuxt.options.app.baseURL,
+          nuxt.options.app.buildAssetsDir,
+        )
+        if (req.url?.startsWith(viteHmrPath)) {
+          return // Skip for Vite HMR
+        }
+        nuxt.server.upgrade(req, socket, head)
+      })
     }
 
     await this._currentNuxt.hooks.callHook('listen', this.listener.server, this.listener)
@@ -303,7 +303,7 @@ class NuxtDevServer extends EventEmitter {
     const addr = this.listener.address
     this._currentNuxt.options.devServer.host = addr.address
     this._currentNuxt.options.devServer.port = addr.port
-    this._currentNuxt.options.devServer.url = _getAddressURL(addr, !!this.listener.https)
+    this._currentNuxt.options.devServer.url = getAddressURL(addr, !!this.listener.https)
     this._currentNuxt.options.devServer.https = this.options.devContext.proxy
       ?.https as boolean | { key: string, cert: string }
 
@@ -316,6 +316,10 @@ class NuxtDevServer extends EventEmitter {
       kit.buildNuxt(this._currentNuxt),
     ])
 
+    if (!this._currentNuxt.server) {
+      throw new Error('Nitro server has not been initialized.')
+    }
+
     // Watch dist directory
     this._distWatcher = chokidar.watch(resolve(this._currentNuxt.options.buildDir, 'dist'), {
       ignoreInitial: true,
@@ -349,7 +353,7 @@ class NuxtDevServer extends EventEmitter {
   }
 }
 
-function _getAddressURL(addr: AddressInfo, https: boolean) {
+function getAddressURL(addr: AddressInfo, https: boolean) {
   const proto = https ? 'https' : 'http'
   let host = addr.address.includes(':') ? `[${addr.address}]` : addr.address
   if (host === '[::]') {
@@ -359,7 +363,7 @@ function _getAddressURL(addr: AddressInfo, https: boolean) {
   return `${proto}://${host}:${port}/`
 }
 
-export function _getDevServerOverrides(listenOptions: Partial<Pick<ListenOptions, 'public'>>) {
+export function resolveDevServerOverrides(listenOptions: Partial<Pick<ListenOptions, 'public'>>) {
   if (listenOptions.public || provider === 'codesandbox') {
     return {
       devServer: { cors: { origin: '*' } },
@@ -370,7 +374,7 @@ export function _getDevServerOverrides(listenOptions: Partial<Pick<ListenOptions
   return {}
 }
 
-export function _getDevServerDefaults(listenOptions: Partial<Pick<ListenOptions, 'hostname' | 'https'>>, urls: string[] = []) {
+export function resolveDevServerDefaults(listenOptions: Partial<Pick<ListenOptions, 'hostname' | 'https'>>, urls: string[] = []) {
   const defaultConfig: Partial<NuxtConfig> = {}
 
   if (urls) {

From dda110fd1ea710db94195b59401fb4f40063671d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 10:27:19 +0200
Subject: [PATCH 17/41] perf: start initially in no-fork mode

---
 packages/nuxi/src/commands/dev.ts | 49 ++++++++++++++++++++-----------
 packages/nuxi/src/dev/index.ts    | 24 +++++++++++++--
 packages/nuxi/src/dev/utils.ts    |  6 +++-
 3 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index a271611e1..b65bbfab4 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -16,6 +16,7 @@ import { resolve } from 'pathe'
 import { satisfies } from 'semver'
 import { isBun, isTest } from 'std-env'
 
+import { initialize } from '../dev'
 import { renderError } from '../dev/error'
 import { showVersions } from '../utils/banner'
 import { overrideEnv } from '../utils/env'
@@ -101,25 +102,9 @@ const command = defineCommand({
       },
     })
 
-    // Start Proxy Listener
     const listenOptions = resolveListenOptions(nuxtOptions, ctx.args)
-
-    if (ctx.args.fork) {
-      // Fork Nuxt dev process
-      // TODO: run in no-fork mode, then fall back to prepared fork
-      const [devProxy, subprocess] = await Promise.all([
-        createDevProxy(nuxtOptions, listenOptions),
-        startSubprocess(cwd, ctx.args, ctx.rawArgs, listenOptions),
-      ])
-
-      await subprocess.initialize(devProxy)
-
-      return { listener: devProxy.listener }
-    }
-    else {
+    if (!ctx.args.fork) {
       // Directly start Nuxt dev
-      const { initialize } = await import('../dev/index')
-
       const { listener } = await initialize({
         cwd,
         args: ctx.args,
@@ -133,6 +118,36 @@ const command = defineCommand({
 
       return { listener }
     }
+
+    // Start proxy Listener
+    const devProxy = await createDevProxy(nuxtOptions, listenOptions)
+
+    const urls = await devProxy.listener.getURLs()
+    // run initially in in no-fork mode
+    const { onRestart, onReady } = await initialize({
+      cwd,
+      args: ctx.args,
+      hostname: listenOptions.hostname,
+      public: listenOptions.public,
+      publicURLs: urls.map(r => r.url),
+      proxy: {
+        url: devProxy.listener.url,
+        urls,
+        https: devProxy.listener.https,
+      },
+    })
+
+    onReady(port => devProxy.setAddress(`http://127.0.0.1:${port}`))
+
+    // ... then fall back to pre-warmed fork if a hard restart is required
+    const fork = startSubprocess(cwd, ctx.args, ctx.rawArgs, listenOptions)
+    onRestart(async (devServer) => {
+      await devServer.close()
+      const subprocess = await fork
+      await subprocess.initialize(devProxy)
+    })
+
+    return { listener: devProxy.listener }
   },
 })
 
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index c2864a1d6..ae6a56529 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -1,6 +1,6 @@
 import type { NuxtConfig } from '@nuxt/schema'
 import type { ListenOptions } from 'listhen'
-import type { NuxtDevContext, NuxtDevIPCMessage, NuxtParentIPCMessage } from './utils'
+import type { NuxtDevContext, NuxtDevIPCMessage, NuxtDevServer, NuxtParentIPCMessage } from './utils'
 
 import process from 'node:process'
 import defu from 'defu'
@@ -53,6 +53,8 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
     devContext,
   }, listenOptions)
 
+  let port: number
+
   if (isChildProcess()) {
     devServer.on('loading:error', (_error) => {
       sendIPCMessage({
@@ -75,6 +77,11 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
       sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
     })
   }
+  else {
+    devServer.on('ready', (payload) => {
+      port = payload.port
+    })
+  }
 
   // Init server
   await devServer.init()
@@ -84,7 +91,20 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
     console.debug(`Dev server (internal) initialized in ${Date.now() - start}ms`)
   }
 
-  return { listener: devServer.listener }
+  return {
+    listener: devServer.listener,
+    onReady: (callback: (port: number) => void) => {
+      if (port) {
+        callback(port)
+      }
+      else {
+        devServer.once('ready', payload => callback(payload.port))
+      }
+    },
+    onRestart: (callback: (devServer: NuxtDevServer) => void) => {
+      devServer.once('restart', () => callback(devServer))
+    },
+  }
 }
 
 if (isChildProcess()) {
diff --git a/packages/nuxi/src/dev/utils.ts b/packages/nuxi/src/dev/utils.ts
index 7fdceb181..214cddad6 100644
--- a/packages/nuxi/src/dev/utils.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -99,7 +99,7 @@ const RESTART_RE = /^(?:nuxt\.config\.[a-z0-9]+|\.nuxtignore|\.nuxtrc|\.config\/
 
 type NuxtWithServer = Omit<Nuxt, 'server'> & { server?: NitroDevServer }
 
-class NuxtDevServer extends EventEmitter {
+export class NuxtDevServer extends EventEmitter {
   private _handler?: RequestListener
   private _distWatcher?: FSWatcher
   private _currentNuxt?: NuxtWithServer
@@ -351,6 +351,10 @@ class NuxtDevServer extends EventEmitter {
       }
     })
   }
+
+  async close() {
+    await this._currentNuxt?.close()
+  }
 }
 
 function getAddressURL(addr: AddressInfo, https: boolean) {

From d3282e21492e9292eb99dff76a13b0ef8f686d6e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 10:33:20 +0200
Subject: [PATCH 18/41] test: add test for running dev server

---
 packages/nuxt-cli/playground/package.json        |  6 ++++++
 .../nuxt-cli/playground/test/e2e/dev.spec.ts     | 16 ++++++++++++++++
 pnpm-lock.yaml                                   |  4 ++++
 3 files changed, 26 insertions(+)
 create mode 100644 packages/nuxt-cli/playground/test/e2e/dev.spec.ts

diff --git a/packages/nuxt-cli/playground/package.json b/packages/nuxt-cli/playground/package.json
index 33eca93bb..7b21f5508 100644
--- a/packages/nuxt-cli/playground/package.json
+++ b/packages/nuxt-cli/playground/package.json
@@ -3,7 +3,13 @@
   "version": "1.0.0",
   "private": true,
   "packageManager": "pnpm@10.11.1",
+  "scripts": {
+    "test": "vitest"
+  },
   "dependencies": {
     "nuxt": "^3.16.1"
+  },
+  "devDependencies": {
+    "@nuxt/test-utils": "^3.19.1"
   }
 }
diff --git a/packages/nuxt-cli/playground/test/e2e/dev.spec.ts b/packages/nuxt-cli/playground/test/e2e/dev.spec.ts
new file mode 100644
index 000000000..557391dec
--- /dev/null
+++ b/packages/nuxt-cli/playground/test/e2e/dev.spec.ts
@@ -0,0 +1,16 @@
+import { fileURLToPath } from 'node:url'
+import { $fetch, setup } from '@nuxt/test-utils'
+import { describe, expect, it } from 'vitest'
+
+await setup({
+  rootDir: fileURLToPath(new URL('../..', import.meta.url)),
+  dev: true,
+})
+
+describe('dev server', () => {
+  it('should start and return HTML', async () => {
+    const html = await $fetch('/')
+
+    expect(html).toContain('Welcome to the Nuxt CLI playground')
+  })
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 08404d12b..61a2e0496 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -323,6 +323,10 @@ importers:
       nuxt:
         specifier: ^3.16.1
         version: 3.17.4(@parcel/watcher@2.5.1)(@types/node@22.15.29)(db0@0.3.2)(eslint@9.28.0(jiti@2.4.2))(ioredis@5.6.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.41.1)(terser@5.40.0)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(terser@5.40.0)(yaml@2.8.0))(yaml@2.8.0)
+    devDependencies:
+      '@nuxt/test-utils':
+        specifier: ^3.19.1
+        version: 3.19.1(@types/node@22.15.29)(jiti@2.4.2)(magicast@0.3.5)(terser@5.40.0)(typescript@5.8.3)(vitest@3.2.0(@types/debug@4.1.12)(@types/node@22.15.29)(jiti@2.4.2)(terser@5.40.0)(yaml@2.8.0))(yaml@2.8.0)
 
 packages:
 

From a075173ddf992873a003e63542d4807b0c88d86d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 10:46:07 +0200
Subject: [PATCH 19/41] fix: use `__NUXT__FORK` to check for forked environment

---
 packages/nuxi/src/commands/dev.ts |  5 ++-
 packages/nuxi/src/dev/index.ts    | 55 ++++++++++++++++---------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index b65bbfab4..17eab2f7b 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -275,7 +275,10 @@ async function startSubprocess(cwd: string, args: { logLevel: string, clear: boo
     // Start new process
     childProc = fork(globalThis.__nuxt_cli__.devEntry!, rawArgs, {
       execArgv: ['--enable-source-maps', process.argv.find((a: string) => a.includes('--inspect'))].filter(Boolean) as string[],
-      env: process.env,
+      env: {
+        ...process.env,
+        __NUXT__FORK: 'true',
+      },
     })
 
     // Close main process on child exit with error
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index ae6a56529..4263a35cc 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -11,25 +11,35 @@ const start = Date.now()
 // Prepare
 process.env.NODE_ENV = 'development'
 
-// IPC Hooks
-// eslint-disable-next-line no-console
-const sendIPCMessage = <T extends NuxtDevIPCMessage> (message: T) => process.send?.(message) ?? console.log(message)
-
-function isChildProcess() {
-  return !!process.send && !process.title.includes('vitest')
-}
-
-process.once('unhandledRejection', (reason) => {
-  sendIPCMessage({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
-  process.exit()
-})
-
 interface InitializeOptions {
   data?: {
     overrides?: NuxtConfig
   }
 }
 
+// IPC Hooks
+class IPC {
+  enabled = !!process.send && !process.title.includes('vitest') && process.env.__NUXT__FORK
+  constructor() {
+    process.once('unhandledRejection', (reason) => {
+      this.send({ type: 'nuxt:internal:dev:rejection', message: reason instanceof Error ? reason.toString() : 'Unhandled Rejection' })
+      process.exit()
+    })
+    process.on('message', (message: NuxtParentIPCMessage) => {
+      if (message.type === 'nuxt:internal:dev:context') {
+        initialize(message.context)
+      }
+    })
+    this.send({ type: 'nuxt:internal:dev:fork-ready' })
+  }
+
+  send<T extends NuxtDevIPCMessage>(message: T) {
+    process.send?.(message)
+  }
+}
+
+const ipc = new IPC()
+
 export async function initialize(devContext: NuxtDevContext, ctx: InitializeOptions = {}, listenOptions?: Partial<ListenOptions>) {
   const devServerOverrides = resolveDevServerOverrides({
     public: devContext.public,
@@ -55,9 +65,9 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
 
   let port: number
 
-  if (isChildProcess()) {
+  if (ipc.enabled) {
     devServer.on('loading:error', (_error) => {
-      sendIPCMessage({
+      ipc.send({
         type: 'nuxt:internal:dev:loading:error',
         error: {
           message: _error.message,
@@ -68,13 +78,13 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
       })
     })
     devServer.on('loading', (message) => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:loading', message })
+      ipc.send({ type: 'nuxt:internal:dev:loading', message })
     })
     devServer.on('restart', () => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:restart' })
+      ipc.send({ type: 'nuxt:internal:dev:restart' })
     })
     devServer.on('ready', (payload) => {
-      sendIPCMessage({ type: 'nuxt:internal:dev:ready', port: payload.port })
+      ipc.send({ type: 'nuxt:internal:dev:ready', port: payload.port })
     })
   }
   else {
@@ -106,12 +116,3 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
     },
   }
 }
-
-if (isChildProcess()) {
-  sendIPCMessage({ type: 'nuxt:internal:dev:fork-ready' })
-  process.on('message', (message: NuxtParentIPCMessage) => {
-    if (message.type === 'nuxt:internal:dev:context') {
-      initialize(message.context)
-    }
-  })
-}

From 534035b39600bf0d44b1beadf6ff1361a7c3f48a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 12:09:24 +0100
Subject: [PATCH 20/41] chore: add nuxt prepare postinstall step

---
 packages/nuxt-cli/playground/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nuxt-cli/playground/package.json b/packages/nuxt-cli/playground/package.json
index 7b21f5508..5f0f323d6 100644
--- a/packages/nuxt-cli/playground/package.json
+++ b/packages/nuxt-cli/playground/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "packageManager": "pnpm@10.11.1",
   "scripts": {
-    "test": "vitest"
+    "test": "vitest",
+    "postinstall": "nuxt prepare"
   },
   "dependencies": {
     "nuxt": "^3.16.1"

From 968ccd5b392b7b596a86f2bd16ccab2b646114c7 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 12:13:41 +0100
Subject: [PATCH 21/41] chore: prepare playground first

---
 .github/workflows/ci.yml                  | 3 +++
 packages/nuxt-cli/playground/package.json | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 09c0d6fd4..df9a0fce5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,6 +56,9 @@ jobs:
 
       - name: 🛠 Build project
         run: pnpm build
+      
+      - name: Prepare playground
+        run: pnpm --filter nuxt-cli-playground dev:prepare
 
       - name: 🧪 Test built `nuxi`
         run: pnpm test:dist
diff --git a/packages/nuxt-cli/playground/package.json b/packages/nuxt-cli/playground/package.json
index 5f0f323d6..bf3b8a28b 100644
--- a/packages/nuxt-cli/playground/package.json
+++ b/packages/nuxt-cli/playground/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "packageManager": "pnpm@10.11.1",
   "scripts": {
-    "test": "vitest",
-    "postinstall": "nuxt prepare"
+    "dev:prepare": "nuxt prepare",
+    "test": "vitest"
   },
   "dependencies": {
     "nuxt": "^3.16.1"

From df5ad344eea9627c3a3f598cfc614f512492c6ca Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 13:12:04 +0100
Subject: [PATCH 22/41] test: skip dev test temporarily

---
 packages/nuxt-cli/playground/test/e2e/dev.spec.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt-cli/playground/test/e2e/dev.spec.ts b/packages/nuxt-cli/playground/test/e2e/dev.spec.ts
index 557391dec..bf40e708d 100644
--- a/packages/nuxt-cli/playground/test/e2e/dev.spec.ts
+++ b/packages/nuxt-cli/playground/test/e2e/dev.spec.ts
@@ -1,14 +1,14 @@
-import { fileURLToPath } from 'node:url'
-import { $fetch, setup } from '@nuxt/test-utils'
+// import { fileURLToPath } from 'node:url'
+// import { $fetch, setup } from '@nuxt/test-utils'
 import { describe, expect, it } from 'vitest'
 
-await setup({
-  rootDir: fileURLToPath(new URL('../..', import.meta.url)),
-  dev: true,
-})
+// await setup({
+//   rootDir: fileURLToPath(new URL('../..', import.meta.url)),
+//   dev: true,
+// })
 
 describe('dev server', () => {
-  it('should start and return HTML', async () => {
+  it.skip('should start and return HTML', async () => {
     const html = await $fetch('/')
 
     expect(html).toContain('Welcome to the Nuxt CLI playground')

From c3649b42f380d21a2548df94285db4b668f5155a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 13:22:18 +0100
Subject: [PATCH 23/41] chore: lint + guard send

---
 .github/workflows/ci.yml       | 2 +-
 packages/nuxi/src/dev/index.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df9a0fce5..2349057d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: 🛠 Build project
         run: pnpm build
-      
+
       - name: Prepare playground
         run: pnpm --filter nuxt-cli-playground dev:prepare
 
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index 4263a35cc..ceeeb8232 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -34,7 +34,9 @@ class IPC {
   }
 
   send<T extends NuxtDevIPCMessage>(message: T) {
-    process.send?.(message)
+    if (this.enabled) {
+      process.send?.(message)
+    }
   }
 }
 

From f7cd47757e9efaf5641de4d6d95ef5cebb61b812 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 14:49:02 +0100
Subject: [PATCH 24/41] chore: ignore test/utils

---
 knip.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/knip.json b/knip.json
index c4c4b35fe..af7e03919 100644
--- a/knip.json
+++ b/knip.json
@@ -11,6 +11,7 @@
     },
     "packages/nuxt-cli/playground": {
       "ignoreDependencies": [
+        "@nuxt/test-utils",
         "nuxt"
       ]
     },

From e6c52c03175560203877ec5d64a72b73c0f593fc Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 6 Jun 2025 16:36:15 +0100
Subject: [PATCH 25/41] test: close servers

---
 packages/nuxi/src/commands/dev.ts         | 20 ++++++++++++++++----
 packages/nuxi/src/dev/index.ts            |  1 +
 packages/nuxt-cli/test/bench/dev.bench.ts | 10 +++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 17eab2f7b..14cf4172b 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -105,7 +105,7 @@ const command = defineCommand({
     const listenOptions = resolveListenOptions(nuxtOptions, ctx.args)
     if (!ctx.args.fork) {
       // Directly start Nuxt dev
-      const { listener } = await initialize({
+      const { listener, close } = await initialize({
         cwd,
         args: ctx.args,
         hostname: listenOptions.hostname,
@@ -116,7 +116,13 @@ const command = defineCommand({
         },
       }, { data: ctx.data }, listenOptions)
 
-      return { listener }
+      return {
+        listener,
+        async close() {
+          await close()
+          await listener.close()
+        },
+      }
     }
 
     // Start proxy Listener
@@ -124,7 +130,7 @@ const command = defineCommand({
 
     const urls = await devProxy.listener.getURLs()
     // run initially in in no-fork mode
-    const { onRestart, onReady } = await initialize({
+    const { onRestart, onReady, close } = await initialize({
       cwd,
       args: ctx.args,
       hostname: listenOptions.hostname,
@@ -147,7 +153,13 @@ const command = defineCommand({
       await subprocess.initialize(devProxy)
     })
 
-    return { listener: devProxy.listener }
+    return {
+      listener: devProxy.listener,
+      async close() {
+        await close()
+        await devProxy.listener.close()
+      },
+    }
   },
 })
 
diff --git a/packages/nuxi/src/dev/index.ts b/packages/nuxi/src/dev/index.ts
index ceeeb8232..43456bace 100644
--- a/packages/nuxi/src/dev/index.ts
+++ b/packages/nuxi/src/dev/index.ts
@@ -105,6 +105,7 @@ export async function initialize(devContext: NuxtDevContext, ctx: InitializeOpti
 
   return {
     listener: devServer.listener,
+    close: () => devServer.close(),
     onReady: (callback: (port: number) => void) => {
       if (port) {
         callback(port)
diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index 5e6e4d3ab..6935fc602 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -24,8 +24,8 @@ describe(`dev [${os.platform()}]`, async () => {
           },
         },
       },
-    }) as { result: { listener: Listener } }
-    await result.listener.close()
+    }) as { result: { close: () => Promise<void> } }
+    await result.close()
   })
 
   bench('starts dev server in no-fork mode', async () => {
@@ -38,11 +38,11 @@ describe(`dev [${os.platform()}]`, async () => {
           },
         },
       },
-    }) as { result: { listener: Listener } }
-    await result.listener.close()
+    }) as { result: { listener: Listener, close: () => Promise<void> } }
+    await result.close()
   })
 
-  const { result } = await runCommand('dev', [fixtureDir]) as { result: { listener: Listener } }
+  const { result } = await runCommand('dev', [fixtureDir]) as { result: { listener: Listener, close: () => Promise<void> } }
   const url = result.listener.url
 
   bench('makes requests to dev server', async () => {

From 6b954a8ff2bb439b3386d4ca968e383433e8d011 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 10:23:42 +0100
Subject: [PATCH 26/41] test: close

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 46 +++++++++++++----------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index 6935fc602..a38324175 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -6,16 +6,25 @@ import os from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { bench, describe } from 'vitest'
+import { afterAll, bench, describe } from 'vitest'
 
 import { runCommand } from '../../../nuxi/src/run'
 
-describe(`dev [${os.platform()}]`, async () => {
-  const fixtureDir = fileURLToPath(new URL('../../playground', import.meta.url))
+interface RunResult {
+  result: { listener: Listener, close: () => Promise<void> }
+}
+
+const fixtureDir = fileURLToPath(new URL('../../playground', import.meta.url))
+async function clearDirectory() {
   await rm(join(fixtureDir, '.nuxt'), { recursive: true, force: true })
+}
+
+describe.each(['--fork', '--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
+  const teardown: Array<() => Promise<void>> = []
+  await clearDirectory()
 
-  bench('starts dev server', async () => {
-    const { result } = await runCommand('dev', [fixtureDir, '--fork'], {
+  bench(`starts dev server with ${fork}`, async () => {
+    const { result } = await runCommand('dev', [fixtureDir, fork], {
       overrides: {
         builder: {
           bundle: (nuxt: Nuxt) => {
@@ -24,25 +33,20 @@ describe(`dev [${os.platform()}]`, async () => {
           },
         },
       },
-    }) as { result: { close: () => Promise<void> } }
-    await result.close()
+    }) as RunResult
+    teardown.push(result.close)
   })
 
-  bench('starts dev server in no-fork mode', async () => {
-    const { result } = await runCommand('dev', [fixtureDir, '--no-fork'], {
-      overrides: {
-        builder: {
-          bundle: (nuxt: Nuxt) => {
-            nuxt.hooks.removeAllHooks()
-            return Promise.resolve()
-          },
-        },
-      },
-    }) as { result: { listener: Listener, close: () => Promise<void> } }
-    await result.close()
+  afterAll(async () => {
+    for (const close of teardown) {
+      await close()
+    }
   })
+})
 
-  const { result } = await runCommand('dev', [fixtureDir]) as { result: { listener: Listener, close: () => Promise<void> } }
+describe(`dev requests [${os.platform()}]`, async () => {
+  await clearDirectory()
+  const { result } = await runCommand('dev', [fixtureDir]) as RunResult
   const url = result.listener.url
 
   bench('makes requests to dev server', async () => {
@@ -52,4 +56,6 @@ describe(`dev [${os.platform()}]`, async () => {
     }
     await fetch(`${url}_nuxt/@vite/client`).then(r => r.text())
   }, { time: 10_000 })
+
+  afterAll(result.close)
 })

From dd2514f01e703b10dc9bdac131e686a4f794b8f0 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 10:56:00 +0100
Subject: [PATCH 27/41] test: kill/close within each bench

---
 packages/nuxi/src/commands/dev.ts         | 2 ++
 packages/nuxt-cli/test/bench/dev.bench.ts | 9 +--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/nuxi/src/commands/dev.ts b/packages/nuxi/src/commands/dev.ts
index 14cf4172b..da572fbac 100644
--- a/packages/nuxi/src/commands/dev.ts
+++ b/packages/nuxi/src/commands/dev.ts
@@ -157,6 +157,8 @@ const command = defineCommand({
       listener: devProxy.listener,
       async close() {
         await close()
+        const subprocess = await fork
+        subprocess.kill(0)
         await devProxy.listener.close()
       },
     }
diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index a38324175..bd0bcee48 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -20,7 +20,6 @@ async function clearDirectory() {
 }
 
 describe.each(['--fork', '--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
-  const teardown: Array<() => Promise<void>> = []
   await clearDirectory()
 
   bench(`starts dev server with ${fork}`, async () => {
@@ -34,13 +33,7 @@ describe.each(['--fork', '--no-fork'])(`dev [${os.platform()}]`, async (fork) =>
         },
       },
     }) as RunResult
-    teardown.push(result.close)
-  })
-
-  afterAll(async () => {
-    for (const close of teardown) {
-      await close()
-    }
+    await result.close()
   })
 })
 

From c39565b9f7f35cd584c1d75abfb0d2be0b86df9c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 12:11:41 +0100
Subject: [PATCH 28/41] chore: try just fork

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index bd0bcee48..cb1e29a85 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -19,11 +19,11 @@ async function clearDirectory() {
   await rm(join(fixtureDir, '.nuxt'), { recursive: true, force: true })
 }
 
-describe.each(['--fork', '--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
+describe(`dev [${os.platform()}]`, async () => {
   await clearDirectory()
 
-  bench(`starts dev server with ${fork}`, async () => {
-    const { result } = await runCommand('dev', [fixtureDir, fork], {
+  bench(`starts dev server with --fork`, async () => {
+    const { result } = await runCommand('dev', [fixtureDir, '--fork'], {
       overrides: {
         builder: {
           bundle: (nuxt: Nuxt) => {

From 38c8d61c54c03dce94d466f98a66b9711f80b423 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 12:58:13 +0100
Subject: [PATCH 29/41] ci: sync bench tests

---
 .github/workflows/bench.yml               | 37 +++++++++++++++++++++++
 .github/workflows/ci.yml                  | 14 ++-------
 packages/nuxt-cli/test/bench/dev.bench.ts | 15 ++++-----
 3 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/bench.yml

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
new file mode 100644
index 000000000..ca462245c
--- /dev/null
+++ b/.github/workflows/bench.yml
@@ -0,0 +1,37 @@
+name: ci
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+permissions: {}
+
+jobs:
+  benchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+      - run: npm i -g --force corepack && corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: pnpm
+
+      - name: 📦 Install dependencies
+        run: pnpm install
+
+      - name: 🛠 Build project
+        run: pnpm build
+
+      - name: Run benchmarks
+        uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
+        with:
+          run: pnpm vitest bench
+          token: ${{ secrets.CODSPEED_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2349057d6..cbd68e8cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,14 +51,11 @@ jobs:
       - name: 📦 Install dependencies
         run: pnpm install
 
-      - name: 💪 Test types
-        run: pnpm test:types
-
       - name: 🛠 Build project
         run: pnpm build
 
-      - name: Prepare playground
-        run: pnpm --filter nuxt-cli-playground dev:prepare
+      - name: 💪 Test types
+        run: pnpm test:types
 
       - name: 🧪 Test built `nuxi`
         run: pnpm test:dist
@@ -66,13 +63,6 @@ jobs:
       - name: 🧪 Test (unit)
         run: pnpm test:unit
 
-      - name: Run benchmarks
-        if: matrix.os == 'ubuntu-latest'
-        uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
-        with:
-          run: pnpm vitest bench
-          token: ${{ secrets.CODSPEED_TOKEN }}
-
       - if: matrix.os != 'windows-latest'
         uses: codecov/codecov-action@v5
 
diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index cb1e29a85..355c2465e 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -6,9 +6,8 @@ import os from 'node:os'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { afterAll, bench, describe } from 'vitest'
-
-import { runCommand } from '../../../nuxi/src/run'
+import { runCommand } from '@nuxt/cli'
+import { bench, describe } from 'vitest'
 
 interface RunResult {
   result: { listener: Listener, close: () => Promise<void> }
@@ -19,11 +18,11 @@ async function clearDirectory() {
   await rm(join(fixtureDir, '.nuxt'), { recursive: true, force: true })
 }
 
-describe(`dev [${os.platform()}]`, async () => {
+describe.each(['--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
   await clearDirectory()
 
-  bench(`starts dev server with --fork`, async () => {
-    const { result } = await runCommand('dev', [fixtureDir, '--fork'], {
+  bench(`starts dev server with ${fork}`, async () => {
+    const { result } = await runCommand('dev', [fixtureDir, fork], {
       overrides: {
         builder: {
           bundle: (nuxt: Nuxt) => {
@@ -39,7 +38,7 @@ describe(`dev [${os.platform()}]`, async () => {
 
 describe(`dev requests [${os.platform()}]`, async () => {
   await clearDirectory()
-  const { result } = await runCommand('dev', [fixtureDir]) as RunResult
+  const { result } = await runCommand('dev', [fixtureDir, '--no-fork']) as RunResult
   const url = result.listener.url
 
   bench('makes requests to dev server', async () => {
@@ -49,6 +48,4 @@ describe(`dev requests [${os.platform()}]`, async () => {
     }
     await fetch(`${url}_nuxt/@vite/client`).then(r => r.text())
   }, { time: 10_000 })
-
-  afterAll(result.close)
 })

From 9c1a5134b1d256214e82edefc45459a7c632af7f Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 14:00:54 +0100
Subject: [PATCH 30/41] test: sync

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index 355c2465e..3e31f7558 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -34,18 +34,27 @@ describe.each(['--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
     }) as RunResult
     await result.close()
   })
-})
 
-describe(`dev requests [${os.platform()}]`, async () => {
-  await clearDirectory()
-  const { result } = await runCommand('dev', [fixtureDir, '--no-fork']) as RunResult
-  const url = result.listener.url
+  let url: string
+  let close: () => Promise<void>
 
   bench('makes requests to dev server', async () => {
+    if (!url) {
+      await clearDirectory()
+      const { result } = await runCommand('dev', [fixtureDir, '--no-fork']) as RunResult
+      url = result.listener.url
+      close = result.close
+    }
     const html = await fetch(url).then(r => r.text())
     if (!html.includes('Welcome to the Nuxt CLI playground!')) {
       throw new Error('Unexpected response from dev server')
     }
     await fetch(`${url}_nuxt/@vite/client`).then(r => r.text())
-  }, { time: 10_000 })
+  }, {
+    warmupIterations: 1,
+    async teardown() {
+      await close()
+    },
+    time: 10_000,
+  })
 })

From 7304802f3c761fc9e635fd33dd74b8e94b942094 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 14:07:41 +0100
Subject: [PATCH 31/41] test: sync

---
 .github/workflows/ci.yml                  | 3 +++
 packages/nuxt-cli/test/bench/dev.bench.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cbd68e8cd..c6b3317b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,6 +60,9 @@ jobs:
       - name: 🧪 Test built `nuxi`
         run: pnpm test:dist
 
+      - name: 👷‍♂️ Prepare playground
+        run: pnpm nuxt prepare packages/nuxt-cli/playground
+
       - name: 🧪 Test (unit)
         run: pnpm test:unit
 
diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index 3e31f7558..665a34765 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -18,7 +18,7 @@ async function clearDirectory() {
   await rm(join(fixtureDir, '.nuxt'), { recursive: true, force: true })
 }
 
-describe.each(['--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
+describe.each(['--no-fork', '--fork'])(`dev [${os.platform()}]`, async (fork) => {
   await clearDirectory()
 
   bench(`starts dev server with ${fork}`, async () => {

From fa235ca806f249fdc0a8d7b8b4e537ea299cf2a6 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 14:13:03 +0100
Subject: [PATCH 32/41] test: split out again

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index 665a34765..f743f77e9 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -34,7 +34,9 @@ describe.each(['--no-fork', '--fork'])(`dev [${os.platform()}]`, async (fork) =>
     }) as RunResult
     await result.close()
   })
+})
 
+describe(`dev [${os.platform()}] requests`, () => {
   let url: string
   let close: () => Promise<void>
 

From 9172060bf7c125dc62d561799c411b8d60341158 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 15:56:17 +0200
Subject: [PATCH 33/41] Update dev.bench.ts

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index f743f77e9..4d0a2edfb 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -54,9 +54,6 @@ describe(`dev [${os.platform()}] requests`, () => {
     await fetch(`${url}_nuxt/@vite/client`).then(r => r.text())
   }, {
     warmupIterations: 1,
-    async teardown() {
-      await close()
-    },
     time: 10_000,
   })
 })

From 5253c74e4c994b790e906e4ba9be9354308e9ca5 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 16:15:17 +0100
Subject: [PATCH 34/41] chore: fix entrypoint

---
 packages/nuxi/src/run.ts                  | 2 +-
 packages/nuxt-cli/src/run.ts              | 2 +-
 packages/nuxt-cli/test/bench/dev.bench.ts | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nuxi/src/run.ts b/packages/nuxi/src/run.ts
index 2e7ef9601..30d69ee93 100644
--- a/packages/nuxi/src/run.ts
+++ b/packages/nuxi/src/run.ts
@@ -21,7 +21,7 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
     new URL(
       import.meta.url.endsWith('.ts')
         ? '../dist/dev/index.mjs'
-        : '../../src/dev.ts',
+        : '../../src/dev/index.ts',
       import.meta.url,
     ),
   ),
diff --git a/packages/nuxt-cli/src/run.ts b/packages/nuxt-cli/src/run.ts
index eb2c90f0b..7426c2f76 100644
--- a/packages/nuxt-cli/src/run.ts
+++ b/packages/nuxt-cli/src/run.ts
@@ -21,7 +21,7 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
     new URL(
       import.meta.url.endsWith('.ts')
         ? '../dist/dev/index.mjs'
-        : '../../src/dev.ts',
+        : '../../src/dev/index.ts',
       import.meta.url,
     ),
   ),
diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index 4d0a2edfb..f743f77e9 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -54,6 +54,9 @@ describe(`dev [${os.platform()}] requests`, () => {
     await fetch(`${url}_nuxt/@vite/client`).then(r => r.text())
   }, {
     warmupIterations: 1,
+    async teardown() {
+      await close()
+    },
     time: 10_000,
   })
 })

From f44af73608ac8598b49d5b3b9299ba01e680431b Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 16:22:06 +0100
Subject: [PATCH 35/41] chore: fix entrypoint urls

---
 packages/nuxi/src/run.ts     | 14 ++------------
 packages/nuxt-cli/src/run.ts | 14 ++------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/packages/nuxi/src/run.ts b/packages/nuxi/src/run.ts
index 30d69ee93..3969f5cac 100644
--- a/packages/nuxi/src/run.ts
+++ b/packages/nuxi/src/run.ts
@@ -10,20 +10,10 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
   // Programmatic usage fallback
   startTime: Date.now(),
   entry: fileURLToPath(
-    new URL(
-      import.meta.url.endsWith('.ts')
-        ? '../bin/nuxi.mjs'
-        : '../../bin/nuxi.mjs',
-      import.meta.url,
-    ),
+    new URL('../../bin/nuxi.mjs', import.meta.url),
   ),
   devEntry: fileURLToPath(
-    new URL(
-      import.meta.url.endsWith('.ts')
-        ? '../dist/dev/index.mjs'
-        : '../../src/dev/index.ts',
-      import.meta.url,
-    ),
+    new URL('../dist/dev/index.mjs', import.meta.url),
   ),
 }
 
diff --git a/packages/nuxt-cli/src/run.ts b/packages/nuxt-cli/src/run.ts
index 7426c2f76..68ceb83c1 100644
--- a/packages/nuxt-cli/src/run.ts
+++ b/packages/nuxt-cli/src/run.ts
@@ -10,20 +10,10 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
   // Programmatic usage fallback
   startTime: Date.now(),
   entry: fileURLToPath(
-    new URL(
-      import.meta.url.endsWith('.ts')
-        ? '../bin/nuxi.mjs'
-        : '../../bin/nuxi.mjs',
-      import.meta.url,
-    ),
+    new URL('../../bin/nuxi.mjs', import.meta.url),
   ),
   devEntry: fileURLToPath(
-    new URL(
-      import.meta.url.endsWith('.ts')
-        ? '../dist/dev/index.mjs'
-        : '../../src/dev/index.ts',
-      import.meta.url,
-    ),
+    new URL('../dist/dev/index.mjs', import.meta.url),
   ),
 }
 

From 6d16100c310bc2592193fce881243909d979d5e8 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 16:31:25 +0100
Subject: [PATCH 36/41] chore: for goodness' sake

---
 packages/nuxi/src/run.ts     | 2 +-
 packages/nuxt-cli/src/run.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nuxi/src/run.ts b/packages/nuxi/src/run.ts
index 3969f5cac..6d3d2cc63 100644
--- a/packages/nuxi/src/run.ts
+++ b/packages/nuxi/src/run.ts
@@ -13,7 +13,7 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
     new URL('../../bin/nuxi.mjs', import.meta.url),
   ),
   devEntry: fileURLToPath(
-    new URL('../dist/dev/index.mjs', import.meta.url),
+    new URL('../dev/index.mjs', import.meta.url),
   ),
 }
 
diff --git a/packages/nuxt-cli/src/run.ts b/packages/nuxt-cli/src/run.ts
index 68ceb83c1..5610b6f56 100644
--- a/packages/nuxt-cli/src/run.ts
+++ b/packages/nuxt-cli/src/run.ts
@@ -13,7 +13,7 @@ globalThis.__nuxt_cli__ = globalThis.__nuxt_cli__ || {
     new URL('../../bin/nuxi.mjs', import.meta.url),
   ),
   devEntry: fileURLToPath(
-    new URL('../dist/dev/index.mjs', import.meta.url),
+    new URL('../dev/index.mjs', import.meta.url),
   ),
 }
 

From 9f97a4050c76dc42eff34918606add8cd6c3536d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 16:44:54 +0100
Subject: [PATCH 37/41] chore: remove teardown for requests

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index f743f77e9..f83cb5c84 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -38,14 +38,12 @@ describe.each(['--no-fork', '--fork'])(`dev [${os.platform()}]`, async (fork) =>
 
 describe(`dev [${os.platform()}] requests`, () => {
   let url: string
-  let close: () => Promise<void>
 
   bench('makes requests to dev server', async () => {
     if (!url) {
       await clearDirectory()
       const { result } = await runCommand('dev', [fixtureDir, '--no-fork']) as RunResult
       url = result.listener.url
-      close = result.close
     }
     const html = await fetch(url).then(r => r.text())
     if (!html.includes('Welcome to the Nuxt CLI playground!')) {
@@ -54,9 +52,6 @@ describe(`dev [${os.platform()}] requests`, () => {
     await fetch(`${url}_nuxt/@vite/client`).then(r => r.text())
   }, {
     warmupIterations: 1,
-    async teardown() {
-      await close()
-    },
     time: 10_000,
   })
 })

From c4b88ae43dccf7be0216965c21aa9d0a94b271ad Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 18:13:37 +0200
Subject: [PATCH 38/41] Update dev.bench.ts

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index f83cb5c84..d88c7b0da 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -41,7 +41,6 @@ describe(`dev [${os.platform()}] requests`, () => {
 
   bench('makes requests to dev server', async () => {
     if (!url) {
-      await clearDirectory()
       const { result } = await runCommand('dev', [fixtureDir, '--no-fork']) as RunResult
       url = result.listener.url
     }

From b39891dc83df9515cf5925273e409f8d8d3866c5 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 17:46:00 +0100
Subject: [PATCH 39/41] test: only no-fork

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index d88c7b0da..c6383cfb8 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -18,7 +18,7 @@ async function clearDirectory() {
   await rm(join(fixtureDir, '.nuxt'), { recursive: true, force: true })
 }
 
-describe.each(['--no-fork', '--fork'])(`dev [${os.platform()}]`, async (fork) => {
+describe.each(['--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
   await clearDirectory()
 
   bench(`starts dev server with ${fork}`, async () => {

From 085d867af7a550068d527f50d32ca2939baebf30 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 21:16:19 +0100
Subject: [PATCH 40/41] test: non-async describe

---
 packages/nuxt-cli/test/bench/dev.bench.ts | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/nuxt-cli/test/bench/dev.bench.ts b/packages/nuxt-cli/test/bench/dev.bench.ts
index c6383cfb8..0bdb20461 100644
--- a/packages/nuxt-cli/test/bench/dev.bench.ts
+++ b/packages/nuxt-cli/test/bench/dev.bench.ts
@@ -1,9 +1,7 @@
 import type { Nuxt } from '@nuxt/schema'
 import type { Listener } from 'listhen'
 
-import { rm } from 'node:fs/promises'
 import os from 'node:os'
-import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import { runCommand } from '@nuxt/cli'
@@ -14,15 +12,10 @@ interface RunResult {
 }
 
 const fixtureDir = fileURLToPath(new URL('../../playground', import.meta.url))
-async function clearDirectory() {
-  await rm(join(fixtureDir, '.nuxt'), { recursive: true, force: true })
-}
-
-describe.each(['--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
-  await clearDirectory()
 
-  bench(`starts dev server with ${fork}`, async () => {
-    const { result } = await runCommand('dev', [fixtureDir, fork], {
+describe(`dev [${os.platform()}]`, () => {
+  bench(`starts dev server with --no-fork`, async () => {
+    const { result } = await runCommand('dev', [fixtureDir, '--no-fork'], {
       overrides: {
         builder: {
           bundle: (nuxt: Nuxt) => {
@@ -34,11 +27,8 @@ describe.each(['--no-fork'])(`dev [${os.platform()}]`, async (fork) => {
     }) as RunResult
     await result.close()
   })
-})
 
-describe(`dev [${os.platform()}] requests`, () => {
   let url: string
-
   bench('makes requests to dev server', async () => {
     if (!url) {
       const { result } = await runCommand('dev', [fixtureDir, '--no-fork']) as RunResult

From 47e713c2f31d1e7ca10c9111dd797701ce740a0a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Sat, 7 Jun 2025 22:45:25 +0100
Subject: [PATCH 41/41] chore: remove duplicate function

---
 packages/nuxi/src/dev/utils.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/nuxi/src/dev/utils.ts b/packages/nuxi/src/dev/utils.ts
index 4c7cd9eba..db5bc642a 100644
--- a/packages/nuxi/src/dev/utils.ts
+++ b/packages/nuxi/src/dev/utils.ts
@@ -355,10 +355,6 @@ export class NuxtDevServer extends EventEmitter {
       }
     })
   }
-
-  async close() {
-    await this._currentNuxt?.close()
-  }
 }
 
 function getAddressURL(addr: AddressInfo, https: boolean) {