call initServer from getServer

blitz-js · Oct 17, 2021 · 40c5503 · 40c5503
1 parent aa560d2
commit 40c5503
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/nextjs/packages/next/server/next-server.ts b/nextjs/packages/next/server/next-server.ts
@@ -217,7 +217,6 @@ export default class Server {
       assetPrefix,
       generateEtags,
       compress,
-      experimental,
     } = this.nextConfig
 
     this.buildId = this.readBuildId()
@@ -277,10 +276,6 @@ export default class Server {
     this.router = new Router(this.generateRoutes())
     this.setAssetPrefix(assetPrefix)
 
-    if (experimental.initServer) {
-      experimental.initServer()
-    }
-
     this.incrementalCache = new IncrementalCache({
       dev,
       distDir: this.distDir,

diff --git a/nextjs/packages/next/server/next.ts b/nextjs/packages/next/server/next.ts
@@ -130,6 +130,11 @@ export class NextServer {
     if (!this.serverPromise) {
       setTimeout(getServerImpl, 10)
       this.serverPromise = this.loadConfig().then(async (conf) => {
+        const initServerCallback = conf.experimental.initServer
+        if (initServerCallback) {
+          await initServerCallback()
+        }
+
         this.server = await this.createServer({
           ...this.options,
           conf,