Fix CPU profile generation

packages/next/src/cli/next-build.ts

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+
+import '../server/lib/cpu-profile'
 import { existsSync } from 'fs'
 import * as Log from '../build/output/log'
 import { CliCommand } from '../lib/commands'

packages/next/src/cli/next-dev.ts

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+
+import '../server/lib/cpu-profile'
 import type { StartServerOptions } from '../server/lib/start-server'
 import { getPort, printAndExit } from '../server/lib/utils'
 import * as Log from '../build/output/log'

packages/next/src/cli/next-start.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import '../server/lib/cpu-profile'
 import { startServer } from '../server/lib/start-server'
 import { getPort, printAndExit } from '../server/lib/utils'
 import { getProjectDir } from '../lib/get-project-dir'

packages/next/src/server/lib/cpu-profile.ts

@@ -1,4 +1,7 @@
-if (process.env.__NEXT_PRIVATE_CPU_PROFILE) {
+const privateCpuProfileName = process.env.__NEXT_PRIVATE_CPU_PROFILE
+const isCpuProfileEnabled = process.env.NEXT_CPU_PROF || privateCpuProfileName
+
+if (isCpuProfileEnabled) {
   const { Session } = require('inspector') as typeof import('inspector')
   const fs = require('fs')
 
@@ -17,12 +20,13 @@ if (process.env.__NEXT_PRIVATE_CPU_PROFILE) {
 
       // Write profile to disk
       const filename = `${
-        process.env.__NEXT_PRIVATE_CPU_PROFILE
+        privateCpuProfileName || 'CPU.main'
       }.${Date.now()}.cpuprofile`
       fs.writeFileSync(`./${filename}`, JSON.stringify(param.profile))
       process.exit(0)
     })
   }
   process.on('SIGINT', saveProfile)
   process.on('SIGTERM', saveProfile)
+  process.on('exit', saveProfile)
 }

packages/next/src/server/lib/setup-server-worker.ts

@@ -1,4 +1,3 @@
-import './cpu-profile'
 import v8 from 'v8'
 import http, { IncomingMessage, ServerResponse } from 'http'
 

packages/next/src/server/lib/start-server.ts

@@ -25,11 +25,6 @@ import chalk from '../../lib/chalk'
 
 const debug = setupDebug('next:start-server')
 
-if (process.env.NEXT_CPU_PROF) {
-  process.env.__NEXT_PRIVATE_CPU_PROFILE = `CPU.router`
-  require('./cpu-profile')
-}
-
 export interface StartServerOptions {
   dir: string
   port: number