fix

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

@@ -17,6 +17,7 @@ import { Rewrite } from '../lib/load-custom-routes'
 import { NextConfigComplete } from '../server/config-shared'
 import { MiddlewareMatcher } from './analysis/get-page-static-info'
 import { NextBuildContext } from '.'
+import { CreateEntrypointsParams, createEntrypoints } from './entries'
 
 type CompilerResult = {
   errors: webpack.StatsError[]
@@ -34,21 +35,24 @@ function isTelemetryPlugin(plugin: unknown): plugin is TelemetryPlugin {
   return plugin instanceof TelemetryPlugin
 }
 
-export async function webpackBuild(commonWebpackOptions: {
-  buildId: string
-  config: NextConfigComplete
-  pagesDir: string | undefined
-  reactProductionProfiling: boolean
-  rewrites: {
-    fallback: Rewrite[]
-    afterFiles: Rewrite[]
-    beforeFiles: Rewrite[]
-  }
-  target: string
-  appDir: string | undefined
-  noMangling: boolean
-  middlewareMatchers: MiddlewareMatcher[] | undefined
-}): Promise<number> {
+export async function webpackBuild(
+  commonWebpackOptions: {
+    buildId: string
+    config: NextConfigComplete
+    pagesDir: string | undefined
+    reactProductionProfiling: boolean
+    rewrites: {
+      fallback: Rewrite[]
+      afterFiles: Rewrite[]
+      beforeFiles: Rewrite[]
+    }
+    target: string
+    appDir: string | undefined
+    noMangling: boolean
+    middlewareMatchers: MiddlewareMatcher[] | undefined
+  },
+  entrypointsParams: CreateEntrypointsParams
+): Promise<number> {
   let result: CompilerResult | null = {
     warnings: [],
     errors: [],
@@ -62,7 +66,10 @@ export async function webpackBuild(commonWebpackOptions: {
     // IIFE to isolate locals and avoid retaining memory too long
     const runWebpackSpan = nextBuildSpan.traceChild('run-webpack-compiler')
 
-    const entrypoints = NextBuildContext.entrypoints!
+    const entrypoints = await nextBuildSpan
+      .traceChild('create-entrypoints')
+      .traceAsyncFn(() => createEntrypoints(entrypointsParams))
+
     const configs = await runWebpackSpan
       .traceChild('generate-webpack-config')
       .traceAsyncFn(() =>