Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update renderOpts.dev handling and fix check #36666

Merged
merged 7 commits into from May 5, 2022
Merged

Update renderOpts.dev handling and fix check #36666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
220bed0
Update renderOpts.dev handling and fix check
ijjk May 3, 2022
a9b0cda
Update awaiting in load-components
ijjk May 3, 2022
3470850
Merge branch 'canary' into fix/app-doc-check
ijjk May 3, 2022
60f696e
extra arg
ijjk May 3, 2022
4c6c362
Merge branch 'canary' into fix/app-doc-check
ijjk May 3, 2022
396e859
fix streaming case
ijjk May 4, 2022
701841d
Merge branch 'canary' into fix/app-doc-check
ijjk May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@ export function getRender({
}

const server = new WebServer({
dev,
conf: config,
minimalMode: true,
webServerConfig: {
Expand Down
16 changes: 12 additions & 4 deletions packages/next/server/load-components.ts
View file
Open in desktop
Expand Up @@ -111,11 +111,19 @@ export async function loadComponents(
}

const [DocumentMod, AppMod, ComponentMod, AppServerMod] = await Promise.all([
requirePage('/_document', distDir, serverless, rootEnabled),
requirePage('/_app', distDir, serverless, rootEnabled),
requirePage(pathname, distDir, serverless, rootEnabled),
Promise.resolve().then(() =>
requirePage('/_document', distDir, serverless, rootEnabled)
),
Promise.resolve().then(() =>
requirePage('/_app', distDir, serverless, rootEnabled)
),
Promise.resolve().then(() =>
requirePage(pathname, distDir, serverless, rootEnabled)
),
serverComponents
? requirePage('/_app.server', distDir, serverless, rootEnabled)
? Promise.resolve().then(() =>
requirePage('/_app.server', distDir, serverless, rootEnabled)
)
: null,
])

Expand Down
2 changes: 1 addition & 1 deletion packages/next/server/next-server.ts
View file
Open in desktop
Expand Up @@ -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
// needed for most requests
loadComponents(this.distDir, '/_document', this._isLikeServerless).catch(
Expand Down