Unverified Commit 41c0a669 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Update renderOpts.dev handling and fix check (#36666)

* Update renderOpts.dev handling and fix check

* Update awaiting in load-components

* extra arg

* fix streaming case
parent 08ffbc9e
...@@ -54,6 +54,7 @@ export function getRender({ ...@@ -54,6 +54,7 @@ export function getRender({
} }
const server = new WebServer({ const server = new WebServer({
dev,
conf: config, conf: config,
minimalMode: true, minimalMode: true,
webServerConfig: { webServerConfig: {
......
...@@ -111,11 +111,19 @@ export async function loadComponents( ...@@ -111,11 +111,19 @@ export async function loadComponents(
} }
const [DocumentMod, AppMod, ComponentMod, AppServerMod] = await Promise.all([ const [DocumentMod, AppMod, ComponentMod, AppServerMod] = await Promise.all([
requirePage('/_document', distDir, serverless, rootEnabled), Promise.resolve().then(() =>
requirePage('/_app', distDir, serverless, rootEnabled), requirePage('/_document', distDir, serverless, rootEnabled)
requirePage(pathname, distDir, serverless, rootEnabled), ),
Promise.resolve().then(() =>
requirePage('/_app', distDir, serverless, rootEnabled)
),
Promise.resolve().then(() =>
requirePage(pathname, distDir, serverless, rootEnabled)
),
serverComponents serverComponents
? requirePage('/_app.server', distDir, serverless, rootEnabled) ? Promise.resolve().then(() =>
requirePage('/_app.server', distDir, serverless, rootEnabled)
)
: null, : null,
]) ])
......
...@@ -126,7 +126,7 @@ export default class NextNodeServer extends BaseServer { ...@@ -126,7 +126,7 @@ export default class NextNodeServer extends BaseServer {
) )
} }
if (!this.renderOpts.dev) { if (!options.dev) {
// pre-warm _document and _app as these will be // pre-warm _document and _app as these will be
// needed for most requests // needed for most requests
loadComponents(this.distDir, '/_document', this._isLikeServerless).catch( loadComponents(this.distDir, '/_document', this._isLikeServerless).catch(
......
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