Commit 0d3dab9d authored by Jimmy Lai's avatar Jimmy Lai

Revert dev-server-init.ts and fix benchmark workflow

- Revert dev-server-init.ts extraction since the lazy loading pattern
  wasn't effective (code gets bundled anyway with static require)
- Inline the dev initialization code back into router-server.ts
- Fix benchmark workflow to use turbo build which builds dependencies

🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: 's avatarClaude Opus 4.5 <noreply@anthropic.com>
parent 7c2c0907
...@@ -99,8 +99,7 @@ jobs: ...@@ -99,8 +99,7 @@ jobs:
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile
- name: Build Next.js (canary) - name: Build Next.js (canary)
run: pnpm build run: turbo run build --filter=next...
working-directory: packages/next
- name: Link Next.js to test app (canary) - name: Link Next.js to test app (canary)
run: | run: |
...@@ -149,8 +148,7 @@ jobs: ...@@ -149,8 +148,7 @@ jobs:
run: pnpm install --frozen-lockfile run: pnpm install --frozen-lockfile
- name: Build Next.js (PR) - name: Build Next.js (PR)
run: pnpm build run: turbo run build --filter=next...
working-directory: packages/next
- name: Link Next.js to test app (PR) - name: Link Next.js to test app (PR)
run: | run: |
...@@ -354,8 +352,7 @@ jobs: ...@@ -354,8 +352,7 @@ jobs:
run: pnpm install run: pnpm install
- name: Build Next.js - name: Build Next.js
run: pnpm build run: turbo run build --filter=next...
working-directory: packages/next
- name: Run bytecode cache unit tests - name: Run bytecode cache unit tests
run: pnpm jest test/unit/bytecode-cache.test.ts --runInBand run: pnpm jest test/unit/bytecode-cache.test.ts --runInBand
import type { NextConfigComplete } from '../config-shared'
import type { DevBundler } from './router-utils/setup-dev-bundler'
import type { setupFsCheck } from './router-utils/filesystem'
import type { UnwrapPromise } from '../../lib/coalesced-function'
import type { Span } from '../../trace'
import type { WorkerRequestHandler } from './types'
import type { LazyRenderServerInstance } from './router-server'
type FsChecker = UnwrapPromise<ReturnType<typeof setupFsCheck>>
import path from 'path'
import { findPagesDir } from '../../lib/find-pages-dir'
import { trace } from '../../trace'
import { traceGlobals } from '../../trace/shared'
import { DevBundlerService } from './dev-bundler-service'
import { NEXT_PATCH_SYMBOL } from './patch-fetch'
export interface DevServerInitOptions {
dir: string
port: number
config: NextConfigComplete
fsChecker: FsChecker
renderServer: LazyRenderServerInstance
customServer?: boolean
startServerSpan?: Span
onDevServerCleanup: ((listener: () => Promise<void>) => void) | undefined
originalFetch: typeof globalThis.fetch
getRequestHandler: () => WorkerRequestHandler
}
export interface DevServerInitResult {
bundler: DevBundler
service: DevBundlerService
config: NextConfigComplete
}
/**
* Initialize the development server components.
* This function is lazily loaded only in development mode to reduce startup time.
*/
export async function initializeDevelopmentServer(
opts: DevServerInitOptions
): Promise<DevServerInitResult> {
// Lazy load telemetry to avoid loading in production
const { Telemetry } =
require('../../telemetry/storage') as typeof import('../../telemetry/storage')
const telemetry = new Telemetry({
distDir: path.join(opts.dir, opts.config.distDir),
})
traceGlobals.set('telemetry', telemetry)
const { pagesDir, appDir } = findPagesDir(opts.dir)
// Lazy load setupDevBundler to avoid loading bundler code in production
const { setupDevBundler } =
require('./router-utils/setup-dev-bundler') as typeof import('./router-utils/setup-dev-bundler')
const resetFetch = () => {
globalThis.fetch = opts.originalFetch
;(globalThis as Record<symbol, unknown>)[NEXT_PATCH_SYMBOL] = false
}
const setupDevBundlerSpan = opts.startServerSpan
? opts.startServerSpan.traceChild('setup-dev-bundler')
: trace('setup-dev-bundler')
const developmentBundler = await setupDevBundlerSpan.traceAsyncFn(() =>
setupDevBundler({
renderServer: opts.renderServer,
appDir,
pagesDir,
telemetry,
fsChecker: opts.fsChecker,
dir: opts.dir,
nextConfig: opts.config,
isCustomServer: opts.customServer,
turbo: !!process.env.TURBOPACK,
port: opts.port,
onDevServerCleanup: opts.onDevServerCleanup,
resetFetch,
})
)
const devBundlerService = new DevBundlerService(
developmentBundler,
// The request handler is assigned later, this allows us to create a lazy
// reference to it.
(req, res) => {
return opts.getRequestHandler()(req, res)
}
)
return {
bundler: developmentBundler,
service: devBundlerService,
config: opts.config,
}
}
...@@ -32,7 +32,11 @@ import { ...@@ -32,7 +32,11 @@ import {
UNDERSCORE_NOT_FOUND_ROUTE, UNDERSCORE_NOT_FOUND_ROUTE,
} from '../../shared/lib/constants' } from '../../shared/lib/constants'
import { RedirectStatusCode } from '../../client/components/redirect-status-code' import { RedirectStatusCode } from '../../client/components/redirect-status-code'
import type { DevBundlerService } from './dev-bundler-service' import { DevBundlerService } from './dev-bundler-service'
import { findPagesDir } from '../../lib/find-pages-dir'
import { trace } from '../../trace'
import { traceGlobals } from '../../trace/shared'
import { NEXT_PATCH_SYMBOL } from './patch-fetch'
import type { Span } from '../../trace' import type { Span } from '../../trace'
import { ensureLeadingSlash } from '../../shared/lib/page-path/ensure-leading-slash' import { ensureLeadingSlash } from '../../shared/lib/page-path/ensure-leading-slash'
import { getNextPathnameInfo } from '../../shared/lib/router/utils/get-next-pathname-info' import { getNextPathnameInfo } from '../../shared/lib/router/utils/get-next-pathname-info'
...@@ -127,23 +131,57 @@ export async function initialize(opts: { ...@@ -127,23 +131,57 @@ export async function initialize(opts: {
let originalFetch = globalThis.fetch let originalFetch = globalThis.fetch
if (opts.dev) { if (opts.dev) {
// Lazy load dev server initialization to reduce startup time const { Telemetry } =
// and enable better bundling of production code paths require('../../telemetry/storage') as typeof import('../../telemetry/storage')
const { initializeDevelopmentServer } =
require('./dev-server-init') as typeof import('./dev-server-init')
development = await initializeDevelopmentServer({ const telemetry = new Telemetry({
distDir: path.join(opts.dir, config.distDir),
})
traceGlobals.set('telemetry', telemetry)
const { pagesDir, appDir } = findPagesDir(opts.dir)
const { setupDevBundler } =
require('./router-utils/setup-dev-bundler') as typeof import('./router-utils/setup-dev-bundler')
const resetFetch = () => {
globalThis.fetch = originalFetch
;(globalThis as Record<symbol, unknown>)[NEXT_PATCH_SYMBOL] = false
}
const setupDevBundlerSpan = opts.startServerSpan
? opts.startServerSpan.traceChild('setup-dev-bundler')
: trace('setup-dev-bundler')
const developmentBundler = await setupDevBundlerSpan.traceAsyncFn(() =>
setupDevBundler({
renderServer,
appDir,
pagesDir,
telemetry,
fsChecker,
dir: opts.dir, dir: opts.dir,
nextConfig: config as NextConfigComplete,
isCustomServer: opts.customServer,
turbo: !!process.env.TURBOPACK,
port: opts.port, port: opts.port,
config: config as NextConfigComplete,
fsChecker,
renderServer,
customServer: opts.customServer,
startServerSpan: opts.startServerSpan,
onDevServerCleanup: opts.onDevServerCleanup, onDevServerCleanup: opts.onDevServerCleanup,
originalFetch, resetFetch,
getRequestHandler: () => requestHandlers[opts.dir],
}) })
)
const devBundlerService = new DevBundlerService(
developmentBundler,
(req, res) => {
return requestHandlers[opts.dir](req, res)
}
)
development = {
bundler: developmentBundler,
service: devBundlerService,
config: config as NextConfigComplete,
}
} }
renderServer.instance = renderServer.instance =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment