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

Cache concurrent ensurePage requests for the same page #52360

Merged
merged 7 commits into from
Jul 7, 2023
Merged

Cache concurrent ensurePage requests for the same page #52360

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
a7dc9fc
avoid register multiple invalidation callbacks
shuding Jul 6, 2023
17fc2c3
fix it for ensurePage
shuding Jul 6, 2023
d72c0f9
Merge branch 'canary' into shu/7e21
kodiakhq[bot] Jul 7, 2023
639e987
Update packages/next/src/build/entries.ts
timneutkens Jul 7, 2023
a45173e
Merge branch 'canary' into shu/7e21
shuding Jul 7, 2023
5abf3e0
Merge branch 'canary' into shu/7e21
shuding Jul 7, 2023
9de318a
Merge branch 'canary' into shu/7e21
kodiakhq[bot] Jul 7, 2023
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
26 changes: 15 additions & 11 deletions packages/next/src/build/entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,34 +416,35 @@ export function getClientEntry(opts: {
: pageLoader
}

export async function runDependingOnPageType<T>(params: {
export function runDependingOnPageType<T>(params: {
onClient: () => T
onEdgeServer: () => T
onServer: () => T
page: string
pageRuntime: ServerRuntime
pageType?: 'app' | 'pages' | 'root'
}): Promise<void> {
}): void {
if (params.pageType === 'root' && isInstrumentationHookFile(params.page)) {
await Promise.all([params.onServer(), params.onEdgeServer()])
params.onServer()
params.onEdgeServer()
return
}

if (isMiddlewareFile(params.page)) {
await params.onEdgeServer()
params.onEdgeServer()
return
}
if (isAPIRoute(params.page)) {
if (isEdgeRuntime(params.pageRuntime)) {
await params.onEdgeServer()
params.onEdgeServer()
return
}

await params.onServer()
params.onServer()
return
}
if (params.page === '/_document') {
await params.onServer()
params.onServer()
return
}
if (
Expand All @@ -452,15 +453,18 @@ export async function runDependingOnPageType<T>(params: {
params.page === '/404' ||
params.page === '/500'
) {
await Promise.all([params.onClient(), params.onServer()])
params.onClient()
params.onServer()
return
}
if (isEdgeRuntime(params.pageRuntime)) {
await Promise.all([params.onClient(), params.onEdgeServer()])
params.onClient()
params.onEdgeServer()
return
}

await Promise.all([params.onClient(), params.onServer()])
params.onClient()
params.onServer()
return
}

Expand Down Expand Up @@ -556,7 +560,7 @@ export async function createEntrypoints(
]
}

await runDependingOnPageType({
runDependingOnPageType({
page,
pageRuntime: staticInfo.runtime,
pageType: pagesType,
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/dev/hot-reloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ export default class HotReloader {
this.hasAppRouterEntrypoints = true
}

await runDependingOnPageType({
runDependingOnPageType({
page,
pageRuntime: staticInfo.runtime,
pageType,
Expand Down